little cleanup about campaign level handling

[lugaru.git] / Source / Game.h

diff --git a/Source/Game.h b/Source/Game.h
index 70fdb9271fce172e39bfef49951f5ba65a8b8458..97e3487d61dcabda13282b8e0fa7bc9616230bf1 100644 (file)
--- a/Source/Game.h
+++ b/Source/Game.h
@@ -139,18 +139,12 @@ class Game
                char campaignmapname[50][256];
                char campaigndescription[50][256];
                int campaignchoosenext[50];
-               int campaignnumnext[50];
+               int campaignnumnext[50]; // 0 on final level. As David said: he meant to add story branching, but he eventually hadn't. 
                int campaignnextlevel[50][10];
                int campaignlocationx[50];
                int campaignlocationy[50];
-               int campaignchoicenum;
-               int campaignchoicewhich[10];
                int whichchoice;
-
-               int numlevelspassed;
-               int levelorder[5000];
-               int levelvisible[50];
-               int levelhighlight[50];
+               int actuallevel;
 
                bool minimap;
 
@@ -300,7 +294,7 @@ class Game
 
 //keeps track of which textures are loaded
 //TODO: delete them properly
-struct TextureInfo{
+struct TextureInfo {
     bool isLoaded;
     bool isSkin;
     const char* fileName;
@@ -310,7 +304,7 @@ struct TextureInfo{
     GLubyte* array;
     int* skinsize;
 
-    void load(){
+    void load() {
         if(isSkin)
             Game::LoadTextureSaveData(fileName,ptextureid,mipmap,array,skinsize,isLoaded);
         else