X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.h;h=c1fb5b127127675c74e5ac749ad53eb9f2d7eccc;hb=5ae3fc5d27076677a95153162abcf527c6dc8e63;hp=d02c5cedc1a52d51fef6a8f6498be71eabb11f05;hpb=44c787009717e23436775bb7f4e3a5115eaba214;p=rocksndiamonds.git

diff --git a/src/game.h b/src/game.h
index d02c5ced..c1fb5b12 100644
--- a/src/game.h
+++ b/src/game.h
@@ -18,16 +18,26 @@
 /* #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_GRAPHICS	8
+#define NUM_PANEL_ELEMENTS	8
+#define NUM_PANEL_CE_SCORE	8
 
 #if 1
 struct GamePanelInfo
 {
   struct TextPosInfo level_number;
   struct TextPosInfo gems;
-  struct TextPosInfo inventory;
+  struct TextPosInfo inventory_count;
+  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;
@@ -36,23 +46,11 @@ struct GamePanelInfo
   struct TextPosInfo time_hh;
   struct TextPosInfo time_mm;
   struct TextPosInfo time_ss;
-  struct TextPosInfo drop_next_1;
-  struct TextPosInfo drop_next_2;
-  struct TextPosInfo drop_next_3;
-  struct TextPosInfo drop_next_4;
-  struct TextPosInfo drop_next_5;
-  struct TextPosInfo drop_next_6;
-  struct TextPosInfo drop_next_7;
-  struct TextPosInfo drop_next_8;
   struct TextPosInfo shield_normal;
   struct TextPosInfo shield_normal_time;
   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;
@@ -72,18 +70,16 @@ 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 graphic[NUM_PANEL_GRAPHICS];
+  struct TextPosInfo element[NUM_PANEL_ELEMENTS];
+  struct TextPosInfo element_count[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;
@@ -119,6 +115,7 @@ struct GameInfo
   struct GameButtonInfo button;
 
   /* values for graphics engine customization */
+  boolean use_native_emc_graphics_engine;
   int forced_scroll_delay_value;
   int scroll_delay_value;
 
@@ -142,6 +139,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;
@@ -220,6 +218,8 @@ struct PlayerInfo
   boolean LevelSolved_PanelOff;
   boolean LevelSolved_SaveTape;
   boolean LevelSolved_SaveScore;
+  int LevelSolved_CountingTime;
+  int LevelSolved_CountingScore;
 
   int last_move_dir;
 
@@ -307,6 +307,8 @@ int GetElementFromGroupElement(int);
 void DrawGameValue_Time(int);
 void DrawGameDoorValues(void);
 
+void UpdateAndDisplayGameControlValues();
+
 void InitGameSound();
 void InitGame();
 
@@ -347,5 +349,6 @@ boolean CheckEngineSnapshot();
 void CreateGameButtons();
 void FreeGameButtons();
 void UnmapGameButtons();
+void RedrawGameButtons();
 
 #endif