moved game values for things still needed from player to game structure

[rocksndiamonds.git] / src / game.h

diff --git a/src/game.h b/src/game.h
index 5ef27e78085b46d12c8cad88fee58027b47a6b78..a0ffe85a31b15e7dff94dee66e4c7ef24844c3b9 100644 (file)
--- a/src/game.h
+++ b/src/game.h
@@ -190,6 +190,13 @@ struct GameInfo
   boolean envelope_active;
   boolean no_time_limit;       // (variable only in very special case)
 
+  int gems_still_needed;
+  int sokoban_fields_still_needed;
+  int sokoban_objects_still_needed;
+  int lights_still_needed;
+  int players_still_needed;
+  int friends_still_needed;
+
   // values for the new EMC elements
   int lenses_time_left;
   int magnify_time_left;
@@ -221,6 +228,18 @@ struct GameInfo
 
   // values for game engine snapshot control
   struct GameSnapshotInfo snapshot;
+
+  // values for handling states for solved level
+  boolean LevelSolved;
+
+  boolean LevelSolved_GameWon;
+  boolean LevelSolved_GameEnd;
+  boolean LevelSolved_SaveTape;
+  boolean LevelSolved_SaveScore;
+
+  int LevelSolved_CountingTime;
+  int LevelSolved_CountingScore;
+  int LevelSolved_CountingHealth;
 };
 
 struct PlayerInfo
@@ -268,16 +287,7 @@ struct PlayerInfo
 
   boolean gravity;
 
-  boolean LevelSolved, GameOver;
-
-  boolean LevelSolved_GameWon;
-  boolean LevelSolved_GameEnd;
-  boolean LevelSolved_SaveTape;
-  boolean LevelSolved_SaveScore;
-
-  int LevelSolved_CountingTime;
-  int LevelSolved_CountingScore;
-  int LevelSolved_CountingHealth;
+  boolean GameOver;
 
   int last_move_dir;
 
@@ -346,12 +356,6 @@ struct PlayerInfo
   int health;
   int health_final;
 
-  int gems_still_needed;
-  int sokoban_fields_still_needed;
-  int sokoban_objects_still_needed;
-  int lights_still_needed;
-  int players_still_needed;
-  int friends_still_needed;
   int key[MAX_NUM_KEYS];
   int num_white_keys;
   int dynabomb_count, dynabomb_size, dynabombs_left, dynabomb_xl;