X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.h;h=f6c93315ceefb04b9b371d8527cfd4f325f19774;hb=be1c10e7863850eba871b2c0da9d635313b2bc01;hp=55a0b5e80484304d4998d116241bd80dacd5d9cc;hpb=5c909110697b6904d58880000face10c8ce8eb18;p=rocksndiamonds.git

diff --git a/src/game.h b/src/game.h
index 55a0b5e8..f6c93315 100644
--- a/src/game.h
+++ b/src/game.h
@@ -18,9 +18,17 @@
 /* #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
@@ -28,26 +36,13 @@ 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;
   struct TextPosInfo score;
+  struct TextPosInfo highscore;
   struct TextPosInfo time;
   struct TextPosInfo time_hh;
   struct TextPosInfo time_mm;
@@ -76,17 +71,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 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;
@@ -122,6 +116,9 @@ struct GameInfo
   struct GameButtonInfo button;
 
   /* values for graphics engine customization */
+  boolean use_native_emc_graphics_engine;
+  boolean use_native_sp_graphics_engine;
+  boolean use_masked_pushing;
   int forced_scroll_delay_value;
   int scroll_delay_value;
 
@@ -187,7 +184,10 @@ struct PlayerInfo
   boolean present;		/* player present in level playfield */
   boolean connected;		/* player connected (locally or via network) */
   boolean active;		/* player present and connected */
+  boolean mapped;		/* player already mapped to input device */
+
   boolean killed;		/* player maybe present/active, but killed */
+  boolean reanimated;		/* player maybe killed, but reanimated */
 
   int index_nr;			/* player number (0 to 3) */
   int index_bit;		/* player number bit (1 << 0 to 1 << 3) */
@@ -195,6 +195,7 @@ struct PlayerInfo
   int client_nr;		/* network client identifier */
 
   byte action;			/* action from local input device */
+  byte mapped_action;		/* action mapped from device to player */
   byte effective_action;	/* action acknowledged from network server
 				   or summarized over all configured input
 				   devices when in single player mode */
@@ -207,8 +208,9 @@ struct PlayerInfo
 
   int GfxAction;
 
-  boolean use_murphy;
+  int initial_element;		/* EL_PLAYER_1 to EL_PLAYER_4 or EL_SP_MURPHY */
   int artwork_element;
+  boolean use_murphy;
 
   boolean block_last_field;
   int block_delay_adjustment;	/* needed for different engine versions */
@@ -224,6 +226,8 @@ struct PlayerInfo
   boolean LevelSolved_PanelOff;
   boolean LevelSolved_SaveTape;
   boolean LevelSolved_SaveScore;
+  int LevelSolved_CountingTime;
+  int LevelSolved_CountingScore;
 
   int last_move_dir;
 
@@ -311,6 +315,8 @@ int GetElementFromGroupElement(int);
 void DrawGameValue_Time(int);
 void DrawGameDoorValues(void);
 
+void UpdateAndDisplayGameControlValues();
+
 void InitGameSound();
 void InitGame();
 
@@ -327,6 +333,7 @@ void StartGameActions(boolean, boolean, long);
 
 void GameActions(void);
 void GameActions_EM_Main();
+void GameActions_SP_Main();
 void GameActions_RND();
 
 void ScrollLevel(int, int);
@@ -351,5 +358,6 @@ boolean CheckEngineSnapshot();
 void CreateGameButtons();
 void FreeGameButtons();
 void UnmapGameButtons();
+void RedrawGameButtons();
 
 #endif