X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.h;h=ac2496e1bae9949340b3f2284bdebe75ab0c27d5;hb=531605e2e684de4c30a4e9927f9c5107f468b163;hp=55a0b5e80484304d4998d116241bd80dacd5d9cc;hpb=5c909110697b6904d58880000face10c8ce8eb18;p=rocksndiamonds.git diff --git a/src/game.h b/src/game.h index 55a0b5e8..ac2496e1 100644 --- a/src/game.h +++ b/src/game.h @@ -18,9 +18,16 @@ /* #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_ELEMENTS 8 +#define NUM_PANEL_CE_SCORE 8 #if 1 struct GamePanelInfo @@ -28,22 +35,8 @@ 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; @@ -76,17 +69,14 @@ 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 element[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; @@ -351,5 +341,6 @@ boolean CheckEngineSnapshot(); void CreateGameButtons(); void FreeGameButtons(); void UnmapGameButtons(); +void RedrawGameButtons(); #endif