moved (and renamed) global variables to game structure (ExitX/ExitY)

[rocksndiamonds.git] / src / game.h

diff --git a/src/game.h b/src/game.h
index fffbefa2766009efdb2e86d4129312799e7a632d..bba270cd06d9085fab7ff0ecb63b208672fffc31 100644 (file)
--- a/src/game.h
+++ b/src/game.h
@@ -191,6 +191,12 @@ struct GameInfo
   boolean envelope_active;
   boolean no_time_limit;       // (variable only in very special case)
 
+  int score;
+  int score_final;
+
+  int health;
+  int health_final;
+
   int gems_still_needed;
   int sokoban_fields_still_needed;
   int sokoban_objects_still_needed;
@@ -198,6 +204,10 @@ struct GameInfo
   int players_still_needed;
   int friends_still_needed;
 
+  int exit_x, exit_y;
+
+  boolean all_players_gone;
+
   // values for the new EMC elements
   int lenses_time_left;
   int magnify_time_left;
@@ -351,12 +361,6 @@ struct PlayerInfo
 
   int step_counter;
 
-  int score;
-  int score_final;
-
-  int health;
-  int health_final;
-
   int key[MAX_NUM_KEYS];
   int num_white_keys;
   int dynabomb_count, dynabomb_size, dynabombs_left, dynabomb_xl;