rnd-20111007-1-src

[rocksndiamonds.git] / src / game.h

diff --git a/src/game.h b/src/game.h
index c1fb5b127127675c74e5ac749ad53eb9f2d7eccc..96af46d0f38c0de5e6e1c4612c03e4a4bb6f621b 100644 (file)
--- a/src/game.h
+++ b/src/game.h
@@ -42,10 +42,12 @@ struct GamePanelInfo
   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;
   struct TextPosInfo time_ss;
+  struct TextPosInfo frame;
   struct TextPosInfo shield_normal;
   struct TextPosInfo shield_normal_time;
   struct TextPosInfo shield_deadly;
@@ -87,12 +89,12 @@ struct GamePanelInfo
 
 struct GameButtonInfo
 {
-  struct MenuPosInfo stop;
-  struct MenuPosInfo pause;
-  struct MenuPosInfo play;
-  struct MenuPosInfo sound_music;
-  struct MenuPosInfo sound_loops;
-  struct MenuPosInfo sound_simple;
+  struct Rect stop;
+  struct Rect pause;
+  struct Rect play;
+  struct Rect sound_music;
+  struct Rect sound_loops;
+  struct Rect sound_simple;
 };
 
 #else
@@ -116,8 +118,11 @@ struct GameInfo
 
   /* 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;
+  int tile_size;
 
   /* values for engine initialization */
   int default_push_delay_fixed;
@@ -173,7 +178,7 @@ struct GameInfo
   boolean set_centered_player;
 
   /* values for random number generator initialization after snapshot */
-  unsigned long num_random_calls;
+  unsigned int num_random_calls;
 };
 
 struct PlayerInfo
@@ -181,7 +186,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) */
@@ -189,6 +197,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 */
@@ -201,8 +210,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 */
@@ -268,7 +278,7 @@ struct PlayerInfo
   int push_delay;
   int push_delay_value;
 
-  unsigned long actual_frame_counter;
+  unsigned int actual_frame_counter;
 
   int drop_delay;
   int drop_pressed_delay;
@@ -321,16 +331,18 @@ void Moving2Blocked(int, int, int *, int *);
 void Blocked2Moving(int, int, int *, int *);
 void DrawDynamite(int, int);
 
-void StartGameActions(boolean, boolean, long);
+void StartGameActions(boolean, boolean, int);
 
 void GameActions(void);
 void GameActions_EM_Main();
+void GameActions_SP_Main();
 void GameActions_RND();
 
 void ScrollLevel(int, int);
 
 void InitPlayLevelSound();
 void PlayLevelSound_EM(int, int, int, int);
+void PlayLevelSound_SP(int, int, int, int);
 
 void RaiseScore(int);
 void RaiseScoreElement(int);
@@ -338,7 +350,7 @@ void RaiseScoreElement(int);
 void RequestQuitGameExt(boolean, boolean, char *);
 void RequestQuitGame(boolean);
 
-unsigned int InitEngineRandom_RND(long);
+unsigned int InitEngineRandom_RND(int);
 unsigned int RND(int);
 
 void FreeEngineSnapshot();
@@ -351,4 +363,6 @@ void FreeGameButtons();
 void UnmapGameButtons();
 void RedrawGameButtons();
 
+void HandleSoundButtonKeys(Key);
+
 #endif