X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.h;h=52202d061e74c7f94b56ec8ba2a389bb1c160088;hb=d546faadf5916b83ccba0515c73cc404c4daa6be;hp=ac2496e1bae9949340b3f2284bdebe75ab0c27d5;hpb=531605e2e684de4c30a4e9927f9c5107f468b163;p=rocksndiamonds.git diff --git a/src/game.h b/src/game.h index ac2496e1..52202d06 100644 --- a/src/game.h +++ b/src/game.h @@ -26,6 +26,7 @@ #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 @@ -41,6 +42,7 @@ 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; @@ -74,7 +76,9 @@ struct GamePanelInfo 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; @@ -112,6 +116,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; @@ -178,6 +183,7 @@ struct PlayerInfo boolean connected; /* player connected (locally or via network) */ boolean active; /* player present and connected */ 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) */ @@ -197,8 +203,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 */ @@ -214,6 +221,8 @@ struct PlayerInfo boolean LevelSolved_PanelOff; boolean LevelSolved_SaveTape; boolean LevelSolved_SaveScore; + int LevelSolved_CountingTime; + int LevelSolved_CountingScore; int last_move_dir; @@ -301,6 +310,8 @@ int GetElementFromGroupElement(int); void DrawGameValue_Time(int); void DrawGameDoorValues(void); +void UpdateAndDisplayGameControlValues(); + void InitGameSound(); void InitGame();