X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.h;h=f6c93315ceefb04b9b371d8527cfd4f325f19774;hb=be1c10e7863850eba871b2c0da9d635313b2bc01;hp=d68147085c70fd0a9110834513e54513c443fb1b;hpb=6d06ba238902736bb99714dc8122bb32a286577a;p=rocksndiamonds.git diff --git a/src/game.h b/src/game.h index d6814708..f6c93315 100644 --- a/src/game.h +++ b/src/game.h @@ -42,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; @@ -116,6 +117,8 @@ 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; @@ -181,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) */ @@ -189,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 */ @@ -201,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 */ @@ -307,6 +315,8 @@ int GetElementFromGroupElement(int); void DrawGameValue_Time(int); void DrawGameDoorValues(void); +void UpdateAndDisplayGameControlValues(); + void InitGameSound(); void InitGame(); @@ -323,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);