X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGame.h;h=92a6945f7ad290109030dbee4d474976881b7fbd;hb=ee149af68386f0e7efe0a2f2ca186f78dfc99b86;hp=33e61c49fe547eb38eae8310f4d329505cbab4b1;hpb=b894601a50f6294d7cc4b6678fc6408f126eea5e;p=lugaru.git

diff --git a/Source/Game.h b/Source/Game.h
index 33e61c4..92a6945 100644
--- a/Source/Game.h
+++ b/Source/Game.h
@@ -46,7 +46,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "Models.h"
 #include "Lights.h"
 #include "Person.h"
-#include "Constants.h"
 #include "Sprite.h"
 //#include <agl.h>
 #include "Text.h"
@@ -119,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;
 
@@ -181,10 +175,6 @@ class Game
 		XYZ cameraloc;
 		float cameradist;
 
-		bool envtogglekeydown;
-		bool slomotogglekeydown;
-		bool texturesizetogglekeydown;
-		bool freezetogglekeydown;
 		int drawtoggle;
 
 		bool editorenabled;
@@ -220,13 +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 registernow;
 		bool autocam;
 
 		unsigned short crouchkey,jumpkey,forwardkey,chatkey,backkey,leftkey,rightkey,drawkey,throwkey,attackkey;
@@ -243,12 +229,22 @@ 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();
 		void SetUpLighting();
 		void Loadlevel(int which);
-		void Loadlevel(char *name);
+		void Loadlevel(const char *name);
 		void Setenvironment(int which);
 		GLvoid ReSizeGLScene(float fov, float near);
 		int findPathDist(int start,int end);
@@ -298,7 +294,6 @@ class Game
 		void inputText(char* str, int* charselected, int* nb_chars);
 		void flash();
 		bool waiting;
-		bool mainmenutogglekeydown;
 		//int mainmenu;
 		Account* accountactive;
 };