merge

[lugaru.git] / Source / Game.h

diff --git a/Source/Game.h b/Source/Game.h
index 74e3a5d29e0eb6861569a644932ac24e4b1aa4d8..337b0bfe71f82fa6986559ef995872705a2ccde2 100644 (file)
--- a/Source/Game.h
+++ b/Source/Game.h
@@ -89,13 +89,8 @@ class Game
                float selectedlong[100];
                float offsetx[100];
                float offsety[100];
-               float movex[100];
-               float movey[100];
-               float transition;
-               int anim;
                int selected;
                int keyselect;
-               int loaddistrib;
                int indemo;
 
                bool won;
@@ -144,8 +139,6 @@ class Game
                int campaignchoosenext[50];
                int campaignnumnext[50];
                int campaignnextlevel[50][10];
-               int campaignchoicesmade;
-               int campaignchoices[5000];
                int campaignlocationx[50];
                int campaignlocationy[50];
                int campaignchoicenum;
@@ -227,6 +220,7 @@ class Game
                void LoadScreenTexture();
                void LoadStuff();
                void LoadingScreen();
+               void LoadCampaign();
                void FadeLoadingScreen(float howmuch);
                void Dispose();
                int DrawGLScene(StereoSide side);