X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.h;h=b658d1f4ec1052f22e4af97ab4b4437fff106597;hb=a1810845210edd7c609a0ce30d235c487a79a1c0;hp=9cea39c32e7388386af9bfb79b752fdff92a6a45;hpb=a14c03ea017046106c3e37e3c59910edcd0a1d73;p=rocksndiamonds.git

diff --git a/src/game.h b/src/game.h
index 9cea39c3..b658d1f4 100644
--- a/src/game.h
+++ b/src/game.h
@@ -25,13 +25,14 @@
 #if 1
 struct GamePanelInfo
 {
-  struct TextPosInfo level;
+  struct TextPosInfo level_number;
   struct TextPosInfo gems;
   struct TextPosInfo inventory;
-  struct TextPosInfo keys;
+  struct TextPosInfo key[MAX_NUM_KEYS];
+  struct TextPosInfo key_white;
+  struct TextPosInfo key_white_count;
   struct TextPosInfo score;
   struct TextPosInfo time;
-
   struct TextPosInfo time_hh;
   struct TextPosInfo time_mm;
   struct TextPosInfo time_ss;
@@ -43,17 +44,6 @@ struct GamePanelInfo
   struct TextPosInfo drop_next_6;
   struct TextPosInfo drop_next_7;
   struct TextPosInfo drop_next_8;
-  struct TextPosInfo emc_keys;
-  struct TextPosInfo key_1;
-  struct TextPosInfo key_2;
-  struct TextPosInfo key_3;
-  struct TextPosInfo key_4;
-  struct TextPosInfo key_5;
-  struct TextPosInfo key_6;
-  struct TextPosInfo key_7;
-  struct TextPosInfo key_8;
-  struct TextPosInfo key_white;
-  struct TextPosInfo white_keys;
   struct TextPosInfo shield_normal;
   struct TextPosInfo shield_normal_time;
   struct TextPosInfo shield_deadly;
@@ -64,7 +54,7 @@ struct GamePanelInfo
   struct TextPosInfo steel_exit;
   struct TextPosInfo em_steel_exit;
   struct TextPosInfo emc_magic_ball;
-  struct TextPosInfo emc_magic_ball_time;
+  struct TextPosInfo emc_magic_ball_switch;
   struct TextPosInfo light_switch;
   struct TextPosInfo light_switch_time;
   struct TextPosInfo timegate_switch;
@@ -83,12 +73,12 @@ struct GamePanelInfo
   struct TextPosInfo sokoban_fields;
   struct TextPosInfo robot_wheel;
   struct TextPosInfo conveyor_belt_1;
-  struct TextPosInfo conveyor_belt_2;
-  struct TextPosInfo conveyor_belt_3;
-  struct TextPosInfo conveyor_belt_4;
   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 magic_wall;
   struct TextPosInfo magic_wall_time;
@@ -97,14 +87,20 @@ struct GamePanelInfo
   struct TextPosInfo player_name;
   struct TextPosInfo level_name;
   struct TextPosInfo level_author;
-  struct TextPosInfo stop;
-  struct TextPosInfo pause;
-  struct TextPosInfo play;
-  struct TextPosInfo sound_music;
-  struct TextPosInfo sound_loops;
-  struct TextPosInfo sound_simple;
 };
+
+struct GameButtonInfo
+{
+  struct MenuPosInfo stop;
+  struct MenuPosInfo pause;
+  struct MenuPosInfo play;
+  struct MenuPosInfo sound_music;
+  struct MenuPosInfo sound_loops;
+  struct MenuPosInfo sound_simple;
+};
+
 #else
+
 struct GamePanelInfo
 {
   struct XY level;
@@ -120,6 +116,7 @@ struct GameInfo
 {
   /* values for control panel */
   struct GamePanelInfo panel;
+  struct GameButtonInfo button;
 
   /* values for engine initialization */
   int default_push_delay_fixed;