X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.h;h=96af46d0f38c0de5e6e1c4612c03e4a4bb6f621b;hb=61c3da024802ecc0268bab42d7499fc0346e4fd3;hp=55a0b5e80484304d4998d116241bd80dacd5d9cc;hpb=5c909110697b6904d58880000face10c8ce8eb18;p=rocksndiamonds.git diff --git a/src/game.h b/src/game.h index 55a0b5e8..96af46d0 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,30 +36,18 @@ 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; struct TextPosInfo time_ss; + struct TextPosInfo frame; struct TextPosInfo shield_normal; struct TextPosInfo shield_normal_time; struct TextPosInfo shield_deadly; @@ -76,17 +72,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; @@ -94,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 @@ -122,8 +117,12 @@ 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; + int tile_size; /* values for engine initialization */ int default_push_delay_fixed; @@ -179,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 @@ -187,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) */ @@ -195,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 */ @@ -207,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 */ @@ -224,6 +228,8 @@ struct PlayerInfo boolean LevelSolved_PanelOff; boolean LevelSolved_SaveTape; boolean LevelSolved_SaveScore; + int LevelSolved_CountingTime; + int LevelSolved_CountingScore; int last_move_dir; @@ -272,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; @@ -311,6 +317,8 @@ int GetElementFromGroupElement(int); void DrawGameValue_Time(int); void DrawGameDoorValues(void); +void UpdateAndDisplayGameControlValues(); + void InitGameSound(); void InitGame(); @@ -323,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); @@ -340,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,5 +361,8 @@ boolean CheckEngineSnapshot(); void CreateGameButtons(); void FreeGameButtons(); void UnmapGameButtons(); +void RedrawGameButtons(); + +void HandleSoundButtonKeys(Key); #endif