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

diff --git a/src/game.h b/src/game.h
index c7e70c31..b658d1f4 100644
--- a/src/game.h
+++ b/src/game.h
@@ -14,12 +14,93 @@
 #ifndef GAME_H
 #define GAME_H
 
+/* (not included here due to collisions with Emerald Mine engine definitions) */
+/* #include "main.h" */
 
 #define MAX_INVENTORY_SIZE	1000
 #define STD_NUM_KEYS		4
 #define MAX_NUM_KEYS		8
 
 
+#if 1
+struct GamePanelInfo
+{
+  struct TextPosInfo level_number;
+  struct TextPosInfo gems;
+  struct TextPosInfo inventory;
+  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;
+  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;
+  struct TextPosInfo light_switch_time;
+  struct TextPosInfo timegate_switch;
+  struct TextPosInfo timegate_switch_time;
+  struct TextPosInfo switchgate_switch;
+  struct TextPosInfo emc_lenses;
+  struct TextPosInfo emc_lenses_time;
+  struct TextPosInfo emc_magnifier;
+  struct TextPosInfo emc_magnifier_time;
+  struct TextPosInfo balloon_switch;
+  struct TextPosInfo dynabomb_number;
+  struct TextPosInfo dynabomb_size;
+  struct TextPosInfo dynabomb_power;
+  struct TextPosInfo penguins;
+  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 magic_wall;
+  struct TextPosInfo magic_wall_time;
+  struct TextPosInfo bd_magic_wall;
+  struct TextPosInfo dc_magic_wall;
+  struct TextPosInfo player_name;
+  struct TextPosInfo level_name;
+  struct TextPosInfo level_author;
+};
+
+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;
@@ -29,11 +110,13 @@ struct GamePanelInfo
   struct XY score;
   struct XY time;
 };
+#endif
 
 struct GameInfo
 {
   /* values for control panel */
   struct GamePanelInfo panel;
+  struct GameButtonInfo button;
 
   /* values for engine initialization */
   int default_push_delay_fixed;
@@ -128,7 +211,9 @@ struct PlayerInfo
 
   boolean LevelSolved, GameOver;
 
+  boolean LevelSolved_GameWon;
   boolean LevelSolved_GameEnd;
+  boolean LevelSolved_PanelOff;
   boolean LevelSolved_SaveTape;
   boolean LevelSolved_SaveScore;
 
@@ -194,6 +279,7 @@ struct PlayerInfo
   int lights_still_needed;
   int friends_still_needed;
   int key[MAX_NUM_KEYS];
+  int num_white_keys;
   int dynabomb_count, dynabomb_size, dynabombs_left, dynabomb_xl;
   int shield_normal_time_left;
   int shield_deadly_time_left;
@@ -212,6 +298,7 @@ void DEBUG_SetMaximumDynamite();
 #endif
 
 void GetPlayerConfig(void);
+int GetElementFromGroupElement(int);
 
 void DrawGameValue_Time(int);
 void DrawGameDoorValues(void);
@@ -241,6 +328,8 @@ void PlayLevelSound_EM(int, int, int, int);
 
 void RaiseScore(int);
 void RaiseScoreElement(int);
+
+void RequestQuitGameExt(boolean, boolean, char *);
 void RequestQuitGame(boolean);
 
 unsigned int InitEngineRandom_RND(long);