X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.h;h=ac2496e1bae9949340b3f2284bdebe75ab0c27d5;hb=531605e2e684de4c30a4e9927f9c5107f468b163;hp=98bdda1df6f56ea4d96bf515b708e02a59497f69;hpb=7b387b9e5e8095a01c18ea041f19d71be83146b9;p=rocksndiamonds.git

diff --git a/src/game.h b/src/game.h
index 98bdda1d..ac2496e1 100644
--- a/src/game.h
+++ b/src/game.h
@@ -18,9 +18,16 @@
 /* #include "main.h" */
 
 #define MAX_INVENTORY_SIZE	1000
+
 #define STD_NUM_KEYS		4
 #define MAX_NUM_KEYS		8
 
+#define NUM_BELTS		4
+#define NUM_BELT_PARTS		3
+
+#define NUM_PANEL_INVENTORY	8
+#define NUM_PANEL_ELEMENTS	8
+#define NUM_PANEL_CE_SCORE	8
 
 #if 1
 struct GamePanelInfo
@@ -28,22 +35,8 @@ struct GamePanelInfo
   struct TextPosInfo level_number;
   struct TextPosInfo gems;
   struct TextPosInfo inventory_count;
-  struct TextPosInfo inventory_first_1;
-  struct TextPosInfo inventory_first_2;
-  struct TextPosInfo inventory_first_3;
-  struct TextPosInfo inventory_first_4;
-  struct TextPosInfo inventory_first_5;
-  struct TextPosInfo inventory_first_6;
-  struct TextPosInfo inventory_first_7;
-  struct TextPosInfo inventory_first_8;
-  struct TextPosInfo inventory_last_1;
-  struct TextPosInfo inventory_last_2;
-  struct TextPosInfo inventory_last_3;
-  struct TextPosInfo inventory_last_4;
-  struct TextPosInfo inventory_last_5;
-  struct TextPosInfo inventory_last_6;
-  struct TextPosInfo inventory_last_7;
-  struct TextPosInfo inventory_last_8;
+  struct TextPosInfo inventory_first[NUM_PANEL_INVENTORY];
+  struct TextPosInfo inventory_last[NUM_PANEL_INVENTORY];
   struct TextPosInfo key[MAX_NUM_KEYS];
   struct TextPosInfo key_white;
   struct TextPosInfo key_white_count;
@@ -57,10 +50,6 @@ struct GamePanelInfo
   struct TextPosInfo shield_deadly;
   struct TextPosInfo shield_deadly_time;
   struct TextPosInfo exit;
-  struct TextPosInfo em_exit;
-  struct TextPosInfo sp_exit;
-  struct TextPosInfo steel_exit;
-  struct TextPosInfo em_steel_exit;
   struct TextPosInfo emc_magic_ball;
   struct TextPosInfo emc_magic_ball_switch;
   struct TextPosInfo light_switch;
@@ -80,18 +69,14 @@ struct GamePanelInfo
   struct TextPosInfo sokoban_objects;
   struct TextPosInfo sokoban_fields;
   struct TextPosInfo robot_wheel;
-  struct TextPosInfo conveyor_belt_1;
-  struct TextPosInfo conveyor_belt_1_switch;
-  struct TextPosInfo conveyor_belt_2;
-  struct TextPosInfo conveyor_belt_2_switch;
-  struct TextPosInfo conveyor_belt_3;
-  struct TextPosInfo conveyor_belt_3_switch;
-  struct TextPosInfo conveyor_belt_4;
-  struct TextPosInfo conveyor_belt_4_switch;
+  struct TextPosInfo conveyor_belt[NUM_BELTS];
+  struct TextPosInfo conveyor_belt_switch[NUM_BELTS];
   struct TextPosInfo magic_wall;
   struct TextPosInfo magic_wall_time;
-  struct TextPosInfo bd_magic_wall;
-  struct TextPosInfo dc_magic_wall;
+  struct TextPosInfo gravity_state;
+  struct TextPosInfo element[NUM_PANEL_ELEMENTS];
+  struct TextPosInfo ce_score[NUM_PANEL_CE_SCORE];
+  struct TextPosInfo ce_score_element[NUM_PANEL_CE_SCORE];
   struct TextPosInfo player_name;
   struct TextPosInfo level_name;
   struct TextPosInfo level_author;
@@ -150,6 +135,7 @@ struct GameInfo
 
   /* variable within running game */
   int yamyam_content_nr;
+  boolean robot_wheel_active;
   boolean magic_wall_active;
   int magic_wall_time_left;
   int light_time_left;
@@ -355,5 +341,6 @@ boolean CheckEngineSnapshot();
 void CreateGameButtons();
 void FreeGameButtons();
 void UnmapGameButtons();
+void RedrawGameButtons();
 
 #endif