X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGame.h;h=92a6945f7ad290109030dbee4d474976881b7fbd;hb=6bd4d8e827e8e47b78db4a1f236cba2eed7032b4;hp=63bb0a6468bfcbf60863b6055005c8ab0a90edd4;hpb=7602f0f320a55597c79cdbee252658d601ca1853;p=lugaru.git diff --git a/Source/Game.h b/Source/Game.h index 63bb0a6..92a6945 100644 --- a/Source/Game.h +++ b/Source/Game.h @@ -118,13 +118,8 @@ class Game float rotation,rotation2; SkyBox skybox; bool cameramode; - bool cameratogglekeydown; - bool chattogglekeydown; int olddrawmode; int drawmode; - bool drawmodetogglekeydown; - bool explodetogglekeydown; - bool detailtogglekeydown; bool firstload; bool oldbutton; @@ -180,10 +175,6 @@ class Game XYZ cameraloc; float cameradist; - bool envtogglekeydown; - bool slomotogglekeydown; - bool texturesizetogglekeydown; - bool freezetogglekeydown; int drawtoggle; bool editorenabled; @@ -219,12 +210,9 @@ class Game bool displayblink; int displayselected; bool consolekeydown; - bool consoletogglekeydown; float consoleblinkdelay; bool consoleblink; int consoleselected; - //int togglekey[140]; - //float togglekeydelay[140]; bool autocam; unsigned short crouchkey,jumpkey,forwardkey,chatkey,backkey,leftkey,rightkey,drawkey,throwkey,attackkey; @@ -241,6 +229,16 @@ class Game void Dispose(); int DrawGLScene(StereoSide side); void DrawGL(); + //factored from Tick() -sf17k + void MenuTick(); + void doTutorial(); + void doDebugKeys(); + void doJumpReversals(); + void doAerialAcrobatics(); + void doAttacks(); + void doPlayerCollisions(); + void doAI(int i); + //end factored void Tick(); void TickOnce(); void TickOnceAfter(); @@ -296,7 +294,6 @@ class Game void inputText(char* str, int* charselected, int* nb_chars); void flash(); bool waiting; - bool mainmenutogglekeydown; //int mainmenu; Account* accountactive; };