add config files to .hgignore

[lugaru.git] / Source / Game.h

diff --git a/Source/Game.h b/Source/Game.h
index 867754de0015c1b3e9940c501fcb7741f8a05e65..92a6945f7ad290109030dbee4d474976881b7fbd 100644 (file)
--- 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;
 };
@@ -345,4 +340,21 @@ extern int directing;
 extern float dialoguetime;
 extern int dialoguegonethrough[20];
 
+enum maptypes {
+  mapkilleveryone, mapgosomewhere,
+  mapkillsomeone, mapkillmost // These two are unused
+};
+
+enum pathtypes {wpkeepwalking, wppause};
+
+static const char *pathtypenames[] = {"keepwalking", "pause"};
+
+enum editortypes {typeactive, typesitting, typesittingwall, typesleeping,
+                 typedead1, typedead2, typedead3, typedead4};
+
+static const char *editortypenames[] = {
+  "active", "sitting", "sitting wall", "sleeping",
+  "dead1", "dead2", "dead3", "dead4"
+};
+
 #endif