X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=f7cb0fe154c970a3e8484c50516e9c303abfc869;hb=872cf2d86e73d185fcad1fac7b389e7d1dfcb839;hp=22008ecc5ee8c436284ef192ea0656a12245f1b2;hpb=9fd0f69468128f9083268835c3098eb7085a14dd;p=rocksndiamonds.git diff --git a/src/game.c b/src/game.c index 22008ecc..f7cb0fe1 100644 --- a/src/game.c +++ b/src/game.c @@ -131,433 +131,548 @@ #if 1 /* game panel display and control definitions */ -#define GAME_CONTROL_LEVEL_NUMBER 0 -#define GAME_CONTROL_GEMS 1 -#define GAME_CONTROL_INVENTORY 2 -#define GAME_CONTROL_KEY_1 3 -#define GAME_CONTROL_KEY_2 4 -#define GAME_CONTROL_KEY_3 5 -#define GAME_CONTROL_KEY_4 6 -#define GAME_CONTROL_KEY_5 7 -#define GAME_CONTROL_KEY_6 8 -#define GAME_CONTROL_KEY_7 9 -#define GAME_CONTROL_KEY_8 10 -#define GAME_CONTROL_KEY_WHITE 11 -#define GAME_CONTROL_KEY_WHITE_COUNT 12 -#define GAME_CONTROL_SCORE 13 -#define GAME_CONTROL_TIME 14 -#define GAME_CONTROL_TIME_HH 15 -#define GAME_CONTROL_TIME_MM 16 -#define GAME_CONTROL_TIME_SS 17 -#define GAME_CONTROL_DROP_NEXT_1 18 -#define GAME_CONTROL_DROP_NEXT_2 19 -#define GAME_CONTROL_DROP_NEXT_3 20 -#define GAME_CONTROL_DROP_NEXT_4 21 -#define GAME_CONTROL_DROP_NEXT_5 22 -#define GAME_CONTROL_DROP_NEXT_6 23 -#define GAME_CONTROL_DROP_NEXT_7 24 -#define GAME_CONTROL_DROP_NEXT_8 25 -#define GAME_CONTROL_SHIELD_NORMAL 26 -#define GAME_CONTROL_SHIELD_NORMAL_TIME 27 -#define GAME_CONTROL_SHIELD_DEADLY 28 -#define GAME_CONTROL_SHIELD_DEADLY_TIME 29 -#define GAME_CONTROL_EXIT 30 -#define GAME_CONTROL_EM_EXIT 31 -#define GAME_CONTROL_SP_EXIT 32 -#define GAME_CONTROL_STEEL_EXIT 33 -#define GAME_CONTROL_EM_STEEL_EXIT 34 -#define GAME_CONTROL_EMC_MAGIC_BALL 35 -#define GAME_CONTROL_EMC_MAGIC_BALL_SWITCH 36 -#define GAME_CONTROL_LIGHT_SWITCH 37 -#define GAME_CONTROL_LIGHT_SWITCH_TIME 38 -#define GAME_CONTROL_TIMEGATE_SWITCH 39 -#define GAME_CONTROL_TIMEGATE_SWITCH_TIME 40 -#define GAME_CONTROL_SWITCHGATE_SWITCH 41 -#define GAME_CONTROL_EMC_LENSES 42 -#define GAME_CONTROL_EMC_LENSES_TIME 43 -#define GAME_CONTROL_EMC_MAGNIFIER 44 -#define GAME_CONTROL_EMC_MAGNIFIER_TIME 45 -#define GAME_CONTROL_BALLOON_SWITCH 46 -#define GAME_CONTROL_DYNABOMB_NUMBER 47 -#define GAME_CONTROL_DYNABOMB_SIZE 48 -#define GAME_CONTROL_DYNABOMB_POWER 49 -#define GAME_CONTROL_PENGUINS 50 -#define GAME_CONTROL_SOKOBAN_OBJECTS 51 -#define GAME_CONTROL_SOKOBAN_FIELDS 52 -#define GAME_CONTROL_ROBOT_WHEEL 53 -#define GAME_CONTROL_CONVEYOR_BELT_1 54 -#define GAME_CONTROL_CONVEYOR_BELT_1_SWITCH 55 -#define GAME_CONTROL_CONVEYOR_BELT_2 56 -#define GAME_CONTROL_CONVEYOR_BELT_2_SWITCH 57 -#define GAME_CONTROL_CONVEYOR_BELT_3 58 -#define GAME_CONTROL_CONVEYOR_BELT_3_SWITCH 59 -#define GAME_CONTROL_CONVEYOR_BELT_4 60 -#define GAME_CONTROL_CONVEYOR_BELT_4_SWITCH 61 -#define GAME_CONTROL_MAGIC_WALL 62 -#define GAME_CONTROL_MAGIC_WALL_TIME 63 -#define GAME_CONTROL_BD_MAGIC_WALL 64 -#define GAME_CONTROL_DC_MAGIC_WALL 65 -#define GAME_CONTROL_PLAYER_NAME 66 -#define GAME_CONTROL_LEVEL_NAME 67 -#define GAME_CONTROL_LEVEL_AUTHOR 68 - -#define NUM_GAME_CONTROLS 69 - -int game_control_value[NUM_GAME_CONTROLS]; -int last_game_control_value[NUM_GAME_CONTROLS]; - -struct GameControlInfo +#define GAME_PANEL_LEVEL_NUMBER 0 +#define GAME_PANEL_GEMS 1 +#define GAME_PANEL_INVENTORY_COUNT 2 +#define GAME_PANEL_INVENTORY_FIRST_1 3 +#define GAME_PANEL_INVENTORY_FIRST_2 4 +#define GAME_PANEL_INVENTORY_FIRST_3 5 +#define GAME_PANEL_INVENTORY_FIRST_4 6 +#define GAME_PANEL_INVENTORY_FIRST_5 7 +#define GAME_PANEL_INVENTORY_FIRST_6 8 +#define GAME_PANEL_INVENTORY_FIRST_7 9 +#define GAME_PANEL_INVENTORY_FIRST_8 10 +#define GAME_PANEL_INVENTORY_LAST_1 11 +#define GAME_PANEL_INVENTORY_LAST_2 12 +#define GAME_PANEL_INVENTORY_LAST_3 13 +#define GAME_PANEL_INVENTORY_LAST_4 14 +#define GAME_PANEL_INVENTORY_LAST_5 15 +#define GAME_PANEL_INVENTORY_LAST_6 16 +#define GAME_PANEL_INVENTORY_LAST_7 17 +#define GAME_PANEL_INVENTORY_LAST_8 18 +#define GAME_PANEL_KEY_1 19 +#define GAME_PANEL_KEY_2 20 +#define GAME_PANEL_KEY_3 21 +#define GAME_PANEL_KEY_4 22 +#define GAME_PANEL_KEY_5 23 +#define GAME_PANEL_KEY_6 24 +#define GAME_PANEL_KEY_7 25 +#define GAME_PANEL_KEY_8 26 +#define GAME_PANEL_KEY_WHITE 27 +#define GAME_PANEL_KEY_WHITE_COUNT 28 +#define GAME_PANEL_SCORE 29 +#define GAME_PANEL_TIME 30 +#define GAME_PANEL_TIME_HH 31 +#define GAME_PANEL_TIME_MM 32 +#define GAME_PANEL_TIME_SS 33 +#define GAME_PANEL_SHIELD_NORMAL 34 +#define GAME_PANEL_SHIELD_NORMAL_TIME 35 +#define GAME_PANEL_SHIELD_DEADLY 36 +#define GAME_PANEL_SHIELD_DEADLY_TIME 37 +#define GAME_PANEL_EXIT 38 +#define GAME_PANEL_EMC_MAGIC_BALL 39 +#define GAME_PANEL_EMC_MAGIC_BALL_SWITCH 40 +#define GAME_PANEL_LIGHT_SWITCH 41 +#define GAME_PANEL_LIGHT_SWITCH_TIME 42 +#define GAME_PANEL_TIMEGATE_SWITCH 43 +#define GAME_PANEL_TIMEGATE_SWITCH_TIME 44 +#define GAME_PANEL_SWITCHGATE_SWITCH 45 +#define GAME_PANEL_EMC_LENSES 46 +#define GAME_PANEL_EMC_LENSES_TIME 47 +#define GAME_PANEL_EMC_MAGNIFIER 48 +#define GAME_PANEL_EMC_MAGNIFIER_TIME 49 +#define GAME_PANEL_BALLOON_SWITCH 50 +#define GAME_PANEL_DYNABOMB_NUMBER 51 +#define GAME_PANEL_DYNABOMB_SIZE 52 +#define GAME_PANEL_DYNABOMB_POWER 53 +#define GAME_PANEL_PENGUINS 54 +#define GAME_PANEL_SOKOBAN_OBJECTS 55 +#define GAME_PANEL_SOKOBAN_FIELDS 56 +#define GAME_PANEL_ROBOT_WHEEL 57 +#define GAME_PANEL_CONVEYOR_BELT_1 58 +#define GAME_PANEL_CONVEYOR_BELT_2 59 +#define GAME_PANEL_CONVEYOR_BELT_3 60 +#define GAME_PANEL_CONVEYOR_BELT_4 61 +#define GAME_PANEL_CONVEYOR_BELT_1_SWITCH 62 +#define GAME_PANEL_CONVEYOR_BELT_2_SWITCH 63 +#define GAME_PANEL_CONVEYOR_BELT_3_SWITCH 64 +#define GAME_PANEL_CONVEYOR_BELT_4_SWITCH 65 +#define GAME_PANEL_MAGIC_WALL 66 +#define GAME_PANEL_MAGIC_WALL_TIME 67 +#define GAME_PANEL_GRAVITY_STATE 68 +#define GAME_PANEL_CE_SCORE_1 69 +#define GAME_PANEL_CE_SCORE_2 70 +#define GAME_PANEL_CE_SCORE_3 71 +#define GAME_PANEL_CE_SCORE_4 72 +#define GAME_PANEL_CE_SCORE_5 73 +#define GAME_PANEL_CE_SCORE_6 74 +#define GAME_PANEL_CE_SCORE_7 75 +#define GAME_PANEL_CE_SCORE_8 76 +#define GAME_PANEL_CE_SCORE_1_ELEMENT 77 +#define GAME_PANEL_CE_SCORE_2_ELEMENT 78 +#define GAME_PANEL_CE_SCORE_3_ELEMENT 79 +#define GAME_PANEL_CE_SCORE_4_ELEMENT 80 +#define GAME_PANEL_CE_SCORE_5_ELEMENT 81 +#define GAME_PANEL_CE_SCORE_6_ELEMENT 82 +#define GAME_PANEL_CE_SCORE_7_ELEMENT 83 +#define GAME_PANEL_CE_SCORE_8_ELEMENT 84 +#define GAME_PANEL_PLAYER_NAME 85 +#define GAME_PANEL_LEVEL_NAME 86 +#define GAME_PANEL_LEVEL_AUTHOR 87 + +#define NUM_GAME_PANEL_CONTROLS 88 + +struct GamePanelControlInfo { int nr; struct TextPosInfo *pos; int type; + + int value, last_value; + int frame, last_frame; + int gfx_frame; }; -static struct GameControlInfo game_controls[] = +static struct GamePanelControlInfo game_panel_controls[] = { { - GAME_CONTROL_LEVEL_NUMBER, + GAME_PANEL_LEVEL_NUMBER, &game.panel.level_number, TYPE_INTEGER, }, { - GAME_CONTROL_GEMS, + GAME_PANEL_GEMS, &game.panel.gems, TYPE_INTEGER, }, { - GAME_CONTROL_INVENTORY, - &game.panel.inventory, + GAME_PANEL_INVENTORY_COUNT, + &game.panel.inventory_count, TYPE_INTEGER, }, { - GAME_CONTROL_KEY_1, - &game.panel.key[0], + GAME_PANEL_INVENTORY_FIRST_1, + &game.panel.inventory_first[0], TYPE_ELEMENT, }, { - GAME_CONTROL_KEY_2, - &game.panel.key[1], + GAME_PANEL_INVENTORY_FIRST_2, + &game.panel.inventory_first[1], TYPE_ELEMENT, }, { - GAME_CONTROL_KEY_3, - &game.panel.key[2], + GAME_PANEL_INVENTORY_FIRST_3, + &game.panel.inventory_first[2], TYPE_ELEMENT, }, { - GAME_CONTROL_KEY_4, - &game.panel.key[3], + GAME_PANEL_INVENTORY_FIRST_4, + &game.panel.inventory_first[3], TYPE_ELEMENT, }, { - GAME_CONTROL_KEY_5, - &game.panel.key[4], + GAME_PANEL_INVENTORY_FIRST_5, + &game.panel.inventory_first[4], TYPE_ELEMENT, }, { - GAME_CONTROL_KEY_6, - &game.panel.key[5], + GAME_PANEL_INVENTORY_FIRST_6, + &game.panel.inventory_first[5], TYPE_ELEMENT, }, { - GAME_CONTROL_KEY_7, - &game.panel.key[6], + GAME_PANEL_INVENTORY_FIRST_7, + &game.panel.inventory_first[6], TYPE_ELEMENT, }, { - GAME_CONTROL_KEY_8, - &game.panel.key[7], + GAME_PANEL_INVENTORY_FIRST_8, + &game.panel.inventory_first[7], TYPE_ELEMENT, }, { - GAME_CONTROL_KEY_WHITE, - &game.panel.key_white, + GAME_PANEL_INVENTORY_LAST_1, + &game.panel.inventory_last[0], TYPE_ELEMENT, }, { - GAME_CONTROL_KEY_WHITE_COUNT, - &game.panel.key_white_count, - TYPE_INTEGER, + GAME_PANEL_INVENTORY_LAST_2, + &game.panel.inventory_last[1], + TYPE_ELEMENT, }, { - GAME_CONTROL_SCORE, - &game.panel.score, - TYPE_INTEGER, + GAME_PANEL_INVENTORY_LAST_3, + &game.panel.inventory_last[2], + TYPE_ELEMENT, }, { - GAME_CONTROL_TIME, - &game.panel.time, - TYPE_INTEGER, + GAME_PANEL_INVENTORY_LAST_4, + &game.panel.inventory_last[3], + TYPE_ELEMENT, }, { - GAME_CONTROL_TIME_HH, - &game.panel.time_hh, - TYPE_INTEGER, + GAME_PANEL_INVENTORY_LAST_5, + &game.panel.inventory_last[4], + TYPE_ELEMENT, }, { - GAME_CONTROL_TIME_MM, - &game.panel.time_mm, - TYPE_INTEGER, + GAME_PANEL_INVENTORY_LAST_6, + &game.panel.inventory_last[5], + TYPE_ELEMENT, }, { - GAME_CONTROL_TIME_SS, - &game.panel.time_ss, - TYPE_INTEGER, + GAME_PANEL_INVENTORY_LAST_7, + &game.panel.inventory_last[6], + TYPE_ELEMENT, }, { - GAME_CONTROL_DROP_NEXT_1, - &game.panel.drop_next_1, + GAME_PANEL_INVENTORY_LAST_8, + &game.panel.inventory_last[7], TYPE_ELEMENT, }, { - GAME_CONTROL_DROP_NEXT_2, - &game.panel.drop_next_2, + GAME_PANEL_KEY_1, + &game.panel.key[0], TYPE_ELEMENT, }, { - GAME_CONTROL_DROP_NEXT_3, - &game.panel.drop_next_3, + GAME_PANEL_KEY_2, + &game.panel.key[1], TYPE_ELEMENT, }, { - GAME_CONTROL_DROP_NEXT_4, - &game.panel.drop_next_4, + GAME_PANEL_KEY_3, + &game.panel.key[2], TYPE_ELEMENT, }, { - GAME_CONTROL_DROP_NEXT_5, - &game.panel.drop_next_5, + GAME_PANEL_KEY_4, + &game.panel.key[3], TYPE_ELEMENT, }, { - GAME_CONTROL_DROP_NEXT_6, - &game.panel.drop_next_6, + GAME_PANEL_KEY_5, + &game.panel.key[4], TYPE_ELEMENT, }, { - GAME_CONTROL_DROP_NEXT_7, - &game.panel.drop_next_7, + GAME_PANEL_KEY_6, + &game.panel.key[5], TYPE_ELEMENT, }, { - GAME_CONTROL_DROP_NEXT_8, - &game.panel.drop_next_8, + GAME_PANEL_KEY_7, + &game.panel.key[6], TYPE_ELEMENT, }, { - GAME_CONTROL_SHIELD_NORMAL, - &game.panel.shield_normal, + GAME_PANEL_KEY_8, + &game.panel.key[7], TYPE_ELEMENT, }, { - GAME_CONTROL_SHIELD_NORMAL_TIME, - &game.panel.shield_normal_time, + GAME_PANEL_KEY_WHITE, + &game.panel.key_white, + TYPE_ELEMENT, + }, + { + GAME_PANEL_KEY_WHITE_COUNT, + &game.panel.key_white_count, TYPE_INTEGER, }, { - GAME_CONTROL_SHIELD_DEADLY, - &game.panel.shield_deadly, - TYPE_ELEMENT, + GAME_PANEL_SCORE, + &game.panel.score, + TYPE_INTEGER, }, { - GAME_CONTROL_SHIELD_DEADLY_TIME, - &game.panel.shield_deadly_time, + GAME_PANEL_TIME, + &game.panel.time, TYPE_INTEGER, }, { - GAME_CONTROL_EXIT, - &game.panel.exit, - TYPE_ELEMENT, + GAME_PANEL_TIME_HH, + &game.panel.time_hh, + TYPE_INTEGER, }, { - GAME_CONTROL_EM_EXIT, - &game.panel.em_exit, - TYPE_ELEMENT, + GAME_PANEL_TIME_MM, + &game.panel.time_mm, + TYPE_INTEGER, }, { - GAME_CONTROL_SP_EXIT, - &game.panel.sp_exit, + GAME_PANEL_TIME_SS, + &game.panel.time_ss, + TYPE_INTEGER, + }, + { + GAME_PANEL_SHIELD_NORMAL, + &game.panel.shield_normal, TYPE_ELEMENT, }, { - GAME_CONTROL_STEEL_EXIT, - &game.panel.steel_exit, + GAME_PANEL_SHIELD_NORMAL_TIME, + &game.panel.shield_normal_time, + TYPE_INTEGER, + }, + { + GAME_PANEL_SHIELD_DEADLY, + &game.panel.shield_deadly, TYPE_ELEMENT, }, { - GAME_CONTROL_EM_STEEL_EXIT, - &game.panel.em_steel_exit, + GAME_PANEL_SHIELD_DEADLY_TIME, + &game.panel.shield_deadly_time, + TYPE_INTEGER, + }, + { + GAME_PANEL_EXIT, + &game.panel.exit, TYPE_ELEMENT, }, { - GAME_CONTROL_EMC_MAGIC_BALL, + GAME_PANEL_EMC_MAGIC_BALL, &game.panel.emc_magic_ball, TYPE_ELEMENT, }, { - GAME_CONTROL_EMC_MAGIC_BALL_SWITCH, + GAME_PANEL_EMC_MAGIC_BALL_SWITCH, &game.panel.emc_magic_ball_switch, TYPE_ELEMENT, }, { - GAME_CONTROL_LIGHT_SWITCH, + GAME_PANEL_LIGHT_SWITCH, &game.panel.light_switch, TYPE_ELEMENT, }, { - GAME_CONTROL_LIGHT_SWITCH_TIME, + GAME_PANEL_LIGHT_SWITCH_TIME, &game.panel.light_switch_time, TYPE_INTEGER, }, { - GAME_CONTROL_TIMEGATE_SWITCH, + GAME_PANEL_TIMEGATE_SWITCH, &game.panel.timegate_switch, TYPE_ELEMENT, }, { - GAME_CONTROL_TIMEGATE_SWITCH_TIME, + GAME_PANEL_TIMEGATE_SWITCH_TIME, &game.panel.timegate_switch_time, TYPE_INTEGER, }, { - GAME_CONTROL_SWITCHGATE_SWITCH, + GAME_PANEL_SWITCHGATE_SWITCH, &game.panel.switchgate_switch, TYPE_ELEMENT, }, { - GAME_CONTROL_EMC_LENSES, + GAME_PANEL_EMC_LENSES, &game.panel.emc_lenses, TYPE_ELEMENT, }, { - GAME_CONTROL_EMC_LENSES_TIME, + GAME_PANEL_EMC_LENSES_TIME, &game.panel.emc_lenses_time, TYPE_INTEGER, }, { - GAME_CONTROL_EMC_MAGNIFIER, + GAME_PANEL_EMC_MAGNIFIER, &game.panel.emc_magnifier, TYPE_ELEMENT, }, { - GAME_CONTROL_EMC_MAGNIFIER_TIME, + GAME_PANEL_EMC_MAGNIFIER_TIME, &game.panel.emc_magnifier_time, TYPE_INTEGER, }, { - GAME_CONTROL_BALLOON_SWITCH, + GAME_PANEL_BALLOON_SWITCH, &game.panel.balloon_switch, TYPE_ELEMENT, }, { - GAME_CONTROL_DYNABOMB_NUMBER, + GAME_PANEL_DYNABOMB_NUMBER, &game.panel.dynabomb_number, TYPE_INTEGER, }, { - GAME_CONTROL_DYNABOMB_SIZE, + GAME_PANEL_DYNABOMB_SIZE, &game.panel.dynabomb_size, TYPE_INTEGER, }, { - GAME_CONTROL_DYNABOMB_POWER, + GAME_PANEL_DYNABOMB_POWER, &game.panel.dynabomb_power, TYPE_ELEMENT, }, { - GAME_CONTROL_PENGUINS, + GAME_PANEL_PENGUINS, &game.panel.penguins, TYPE_INTEGER, }, { - GAME_CONTROL_SOKOBAN_OBJECTS, + GAME_PANEL_SOKOBAN_OBJECTS, &game.panel.sokoban_objects, TYPE_INTEGER, }, { - GAME_CONTROL_SOKOBAN_FIELDS, + GAME_PANEL_SOKOBAN_FIELDS, &game.panel.sokoban_fields, TYPE_INTEGER, }, { - GAME_CONTROL_ROBOT_WHEEL, + GAME_PANEL_ROBOT_WHEEL, &game.panel.robot_wheel, TYPE_ELEMENT, }, { - GAME_CONTROL_CONVEYOR_BELT_1, - &game.panel.conveyor_belt_1, + GAME_PANEL_CONVEYOR_BELT_1, + &game.panel.conveyor_belt[0], TYPE_ELEMENT, }, { - GAME_CONTROL_CONVEYOR_BELT_1_SWITCH, - &game.panel.conveyor_belt_1_switch, + GAME_PANEL_CONVEYOR_BELT_2, + &game.panel.conveyor_belt[1], TYPE_ELEMENT, }, { - GAME_CONTROL_CONVEYOR_BELT_2, - &game.panel.conveyor_belt_2, + GAME_PANEL_CONVEYOR_BELT_3, + &game.panel.conveyor_belt[2], TYPE_ELEMENT, }, { - GAME_CONTROL_CONVEYOR_BELT_2_SWITCH, - &game.panel.conveyor_belt_2_switch, + GAME_PANEL_CONVEYOR_BELT_4, + &game.panel.conveyor_belt[3], TYPE_ELEMENT, }, { - GAME_CONTROL_CONVEYOR_BELT_3, - &game.panel.conveyor_belt_3, + GAME_PANEL_CONVEYOR_BELT_1_SWITCH, + &game.panel.conveyor_belt_switch[0], TYPE_ELEMENT, }, { - GAME_CONTROL_CONVEYOR_BELT_3_SWITCH, - &game.panel.conveyor_belt_3_switch, + GAME_PANEL_CONVEYOR_BELT_2_SWITCH, + &game.panel.conveyor_belt_switch[1], TYPE_ELEMENT, }, { - GAME_CONTROL_CONVEYOR_BELT_4, - &game.panel.conveyor_belt_4, + GAME_PANEL_CONVEYOR_BELT_3_SWITCH, + &game.panel.conveyor_belt_switch[2], TYPE_ELEMENT, }, { - GAME_CONTROL_CONVEYOR_BELT_4_SWITCH, - &game.panel.conveyor_belt_4_switch, + GAME_PANEL_CONVEYOR_BELT_4_SWITCH, + &game.panel.conveyor_belt_switch[3], TYPE_ELEMENT, }, { - GAME_CONTROL_MAGIC_WALL, + GAME_PANEL_MAGIC_WALL, &game.panel.magic_wall, TYPE_ELEMENT, }, { - GAME_CONTROL_MAGIC_WALL_TIME, + GAME_PANEL_MAGIC_WALL_TIME, &game.panel.magic_wall_time, TYPE_INTEGER, }, { - GAME_CONTROL_BD_MAGIC_WALL, - &game.panel.bd_magic_wall, + GAME_PANEL_GRAVITY_STATE, + &game.panel.gravity_state, + TYPE_STRING, + }, + { + GAME_PANEL_CE_SCORE_1, + &game.panel.ce_score[0], + TYPE_INTEGER, + }, + { + GAME_PANEL_CE_SCORE_2, + &game.panel.ce_score[1], + TYPE_INTEGER, + }, + { + GAME_PANEL_CE_SCORE_3, + &game.panel.ce_score[2], + TYPE_INTEGER, + }, + { + GAME_PANEL_CE_SCORE_4, + &game.panel.ce_score[3], + TYPE_INTEGER, + }, + { + GAME_PANEL_CE_SCORE_5, + &game.panel.ce_score[4], + TYPE_INTEGER, + }, + { + GAME_PANEL_CE_SCORE_6, + &game.panel.ce_score[5], + TYPE_INTEGER, + }, + { + GAME_PANEL_CE_SCORE_7, + &game.panel.ce_score[6], + TYPE_INTEGER, + }, + { + GAME_PANEL_CE_SCORE_8, + &game.panel.ce_score[7], + TYPE_INTEGER, + }, + { + GAME_PANEL_CE_SCORE_1_ELEMENT, + &game.panel.ce_score_element[0], + TYPE_ELEMENT, + }, + { + GAME_PANEL_CE_SCORE_2_ELEMENT, + &game.panel.ce_score_element[1], + TYPE_ELEMENT, + }, + { + GAME_PANEL_CE_SCORE_3_ELEMENT, + &game.panel.ce_score_element[2], + TYPE_ELEMENT, + }, + { + GAME_PANEL_CE_SCORE_4_ELEMENT, + &game.panel.ce_score_element[3], + TYPE_ELEMENT, + }, + { + GAME_PANEL_CE_SCORE_5_ELEMENT, + &game.panel.ce_score_element[4], + TYPE_ELEMENT, + }, + { + GAME_PANEL_CE_SCORE_6_ELEMENT, + &game.panel.ce_score_element[5], TYPE_ELEMENT, }, { - GAME_CONTROL_DC_MAGIC_WALL, - &game.panel.dc_magic_wall, + GAME_PANEL_CE_SCORE_7_ELEMENT, + &game.panel.ce_score_element[6], TYPE_ELEMENT, }, { - GAME_CONTROL_PLAYER_NAME, + GAME_PANEL_CE_SCORE_8_ELEMENT, + &game.panel.ce_score_element[7], + TYPE_ELEMENT, + }, + { + GAME_PANEL_PLAYER_NAME, &game.panel.player_name, TYPE_STRING, }, { - GAME_CONTROL_LEVEL_NAME, + GAME_PANEL_LEVEL_NAME, &game.panel.level_name, TYPE_STRING, }, { - GAME_CONTROL_LEVEL_AUTHOR, + GAME_PANEL_LEVEL_AUTHOR, &game.panel.level_author, TYPE_STRING, }, @@ -1731,39 +1846,107 @@ static int get_key_element_from_nr(int key_nr) return key_base_element + key_nr; } +static int get_next_dropped_element(struct PlayerInfo *player) +{ + return (player->inventory_size > 0 ? + player->inventory_element[player->inventory_size - 1] : + player->inventory_infinite_element != EL_UNDEFINED ? + player->inventory_infinite_element : + player->dynabombs_left > 0 ? + EL_DYNABOMB_PLAYER_1_ACTIVE + player->index_nr : + EL_UNDEFINED); +} + +static int get_inventory_element_from_pos(struct PlayerInfo *player, int pos) +{ + /* pos >= 0: get element from bottom of the stack; + pos < 0: get element from top of the stack */ + + if (pos < 0) + { + int min_inventory_size = -pos; + int inventory_pos = player->inventory_size - min_inventory_size; + int min_dynabombs_left = min_inventory_size - player->inventory_size; + + return (player->inventory_size >= min_inventory_size ? + player->inventory_element[inventory_pos] : + player->inventory_infinite_element != EL_UNDEFINED ? + player->inventory_infinite_element : + player->dynabombs_left >= min_dynabombs_left ? + EL_DYNABOMB_PLAYER_1 + player->index_nr : + EL_UNDEFINED); + } + else + { + int min_dynabombs_left = pos + 1; + int min_inventory_size = pos + 1 - player->dynabombs_left; + int inventory_pos = pos - player->dynabombs_left; + + return (player->inventory_infinite_element != EL_UNDEFINED ? + player->inventory_infinite_element : + player->dynabombs_left >= min_dynabombs_left ? + EL_DYNABOMB_PLAYER_1 + player->index_nr : + player->inventory_size >= min_inventory_size ? + player->inventory_element[inventory_pos] : + EL_UNDEFINED); + } +} + void InitGameControlValues() { int i; - for (i = 0; game_controls[i].nr != -1; i++) + for (i = 0; game_panel_controls[i].nr != -1; i++) { - int nr = game_controls[i].nr; - int type = game_controls[i].type; - struct TextPosInfo *pos = game_controls[i].pos; + struct GamePanelControlInfo *gpc = &game_panel_controls[i]; + int nr = gpc->nr; + int type = gpc->type; + struct TextPosInfo *pos = gpc->pos; + + if (nr != i) + { + Error(ERR_INFO, "'game_panel_controls' structure corrupted"); + Error(ERR_EXIT, "this should not happen -- please debug"); + } /* force update of game controls after initialization */ - game_control_value[nr] = last_game_control_value[nr] = -1; + gpc->value = gpc->last_value = -1; + gpc->frame = gpc->last_frame = -1; + gpc->gfx_frame = -1; /* determine panel value width for later calculation of alignment */ if (type == TYPE_INTEGER || type == TYPE_STRING) - pos->width = pos->chars * getFontWidth(pos->font); + { + pos->width = pos->size * getFontWidth(pos->font); + pos->height = getFontHeight(pos->font); + } else if (type == TYPE_ELEMENT) - pos->width = MINI_TILESIZE; + { + pos->width = pos->size; + pos->height = pos->size; + } } } void UpdateGameControlValues() { int i, k; - - game_control_value[GAME_CONTROL_LEVEL_NUMBER] = level_nr; - game_control_value[GAME_CONTROL_GEMS] = local_player->gems_still_needed; - - game_control_value[GAME_CONTROL_INVENTORY] = 0; + int time = (level.time == 0 ? TimePlayed : TimeLeft); + int score = (local_player->LevelSolved ? local_player->score_final : + local_player->score); + int exit_closed = (local_player->gems_still_needed > 0 || + local_player->sokobanfields_still_needed > 0 || + local_player->lights_still_needed > 0); + + game_panel_controls[GAME_PANEL_LEVEL_NUMBER].value = level_nr; + game_panel_controls[GAME_PANEL_GEMS].value = + local_player->gems_still_needed; + + game_panel_controls[GAME_PANEL_INVENTORY_COUNT].value = 0; for (i = 0; i < MAX_NUM_KEYS; i++) - game_control_value[GAME_CONTROL_KEY_1 + i] = EL_EMPTY; - game_control_value[GAME_CONTROL_KEY_WHITE] = EL_EMPTY; - game_control_value[GAME_CONTROL_KEY_WHITE_COUNT] = 0; + game_panel_controls[GAME_PANEL_KEY_1 + i].value = EL_EMPTY; + game_panel_controls[GAME_PANEL_KEY_WHITE].value = EL_EMPTY; + game_panel_controls[GAME_PANEL_KEY_WHITE_COUNT].value = 0; if (game.centered_player_nr == -1) { @@ -1771,16 +1954,17 @@ void UpdateGameControlValues() { for (k = 0; k < MAX_NUM_KEYS; k++) if (stored_player[i].key[k]) - game_control_value[GAME_CONTROL_KEY_1 + k] = + game_panel_controls[GAME_PANEL_KEY_1 + k].value = get_key_element_from_nr(k); - game_control_value[GAME_CONTROL_INVENTORY] += + game_panel_controls[GAME_PANEL_INVENTORY_COUNT].value += stored_player[i].inventory_size; if (stored_player[i].num_white_keys > 0) - game_control_value[GAME_CONTROL_KEY_WHITE] = EL_DC_KEY_WHITE; + game_panel_controls[GAME_PANEL_KEY_WHITE].value = + EL_DC_KEY_WHITE; - game_control_value[GAME_CONTROL_KEY_WHITE_COUNT] += + game_panel_controls[GAME_PANEL_KEY_WHITE_COUNT].value += stored_player[i].num_white_keys; } } @@ -1790,154 +1974,185 @@ void UpdateGameControlValues() for (k = 0; k < MAX_NUM_KEYS; k++) if (stored_player[player_nr].key[k]) - game_control_value[GAME_CONTROL_KEY_1 + k] = + game_panel_controls[GAME_PANEL_KEY_1 + k].value = get_key_element_from_nr(k); - game_control_value[GAME_CONTROL_INVENTORY] += + game_panel_controls[GAME_PANEL_INVENTORY_COUNT].value += stored_player[player_nr].inventory_size; if (stored_player[player_nr].num_white_keys > 0) - game_control_value[GAME_CONTROL_KEY_WHITE] = EL_DC_KEY_WHITE; + game_panel_controls[GAME_PANEL_KEY_WHITE].value = EL_DC_KEY_WHITE; - game_control_value[GAME_CONTROL_KEY_WHITE_COUNT] += + game_panel_controls[GAME_PANEL_KEY_WHITE_COUNT].value += stored_player[player_nr].num_white_keys; } - game_control_value[GAME_CONTROL_SCORE] = (local_player->LevelSolved ? - local_player->score_final : - local_player->score); + for (i = 0; i < NUM_PANEL_INVENTORY; i++) + { + game_panel_controls[GAME_PANEL_INVENTORY_FIRST_1 + i].value = + get_inventory_element_from_pos(local_player, i); + game_panel_controls[GAME_PANEL_INVENTORY_LAST_1 + i].value = + get_inventory_element_from_pos(local_player, -i - 1); + } - game_control_value[GAME_CONTROL_TIME] = (level.time == 0 ? - TimePlayed : - TimeLeft); + game_panel_controls[GAME_PANEL_SCORE].value = score; - game_control_value[GAME_CONTROL_TIME_HH] = TapeTime / 3600; - game_control_value[GAME_CONTROL_TIME_MM] = (TapeTime / 60) % 60; - game_control_value[GAME_CONTROL_TIME_SS] = TapeTime % 60; + game_panel_controls[GAME_PANEL_TIME].value = time; - /* !!! TODO !!! */ - for (i = 0; i < 8; i++) - game_control_value[GAME_CONTROL_DROP_NEXT_1 + i] = EL_UNDEFINED; + game_panel_controls[GAME_PANEL_TIME_HH].value = time / 3600; + game_panel_controls[GAME_PANEL_TIME_MM].value = (time / 60) % 60; + game_panel_controls[GAME_PANEL_TIME_SS].value = time % 60; - game_control_value[GAME_CONTROL_SHIELD_NORMAL] = + game_panel_controls[GAME_PANEL_SHIELD_NORMAL].value = (local_player->shield_normal_time_left > 0 ? EL_SHIELD_NORMAL_ACTIVE : EL_EMPTY); - game_control_value[GAME_CONTROL_SHIELD_NORMAL_TIME] = + game_panel_controls[GAME_PANEL_SHIELD_NORMAL_TIME].value = local_player->shield_normal_time_left; - game_control_value[GAME_CONTROL_SHIELD_DEADLY] = + game_panel_controls[GAME_PANEL_SHIELD_DEADLY].value = (local_player->shield_deadly_time_left > 0 ? EL_SHIELD_DEADLY_ACTIVE : EL_EMPTY); - game_control_value[GAME_CONTROL_SHIELD_DEADLY_TIME] = + game_panel_controls[GAME_PANEL_SHIELD_DEADLY_TIME].value = local_player->shield_deadly_time_left; - if (local_player->gems_still_needed > 0 || - local_player->sokobanfields_still_needed > 0 || - local_player->lights_still_needed > 0) - { - game_control_value[GAME_CONTROL_EXIT] = EL_EXIT_CLOSED; - game_control_value[GAME_CONTROL_EM_EXIT] = EL_EM_EXIT_CLOSED; - game_control_value[GAME_CONTROL_SP_EXIT] = EL_SP_EXIT_CLOSED; - game_control_value[GAME_CONTROL_STEEL_EXIT] = EL_STEEL_EXIT_CLOSED; - game_control_value[GAME_CONTROL_EM_STEEL_EXIT] = EL_EM_STEEL_EXIT_CLOSED; - } - else - { - game_control_value[GAME_CONTROL_EXIT] = EL_EXIT_OPEN; - game_control_value[GAME_CONTROL_EM_EXIT] = EL_EM_EXIT_OPEN; - game_control_value[GAME_CONTROL_SP_EXIT] = EL_SP_EXIT_OPEN; - game_control_value[GAME_CONTROL_STEEL_EXIT] = EL_STEEL_EXIT_OPEN; - game_control_value[GAME_CONTROL_EM_STEEL_EXIT] = EL_EM_STEEL_EXIT_OPEN; - } + game_panel_controls[GAME_PANEL_EXIT].value = + (exit_closed ? EL_EXIT_CLOSED : EL_EXIT_OPEN); - /* !!! TODO !!! */ - game_control_value[GAME_CONTROL_EMC_MAGIC_BALL] = EL_UNDEFINED; - game_control_value[GAME_CONTROL_EMC_MAGIC_BALL_SWITCH] = EL_UNDEFINED; + game_panel_controls[GAME_PANEL_EMC_MAGIC_BALL].value = + (game.ball_state ? EL_EMC_MAGIC_BALL_ACTIVE : EL_EMC_MAGIC_BALL); + game_panel_controls[GAME_PANEL_EMC_MAGIC_BALL_SWITCH].value = + (game.ball_state ? EL_EMC_MAGIC_BALL_SWITCH_ACTIVE : + EL_EMC_MAGIC_BALL_SWITCH); - game_control_value[GAME_CONTROL_LIGHT_SWITCH] = + game_panel_controls[GAME_PANEL_LIGHT_SWITCH].value = (game.light_time_left > 0 ? EL_LIGHT_SWITCH_ACTIVE : EL_LIGHT_SWITCH); - game_control_value[GAME_CONTROL_LIGHT_SWITCH_TIME] = game.light_time_left; + game_panel_controls[GAME_PANEL_LIGHT_SWITCH_TIME].value = + game.light_time_left; - game_control_value[GAME_CONTROL_TIMEGATE_SWITCH] = + game_panel_controls[GAME_PANEL_TIMEGATE_SWITCH].value = (game.timegate_time_left > 0 ? EL_TIMEGATE_OPEN : EL_TIMEGATE_CLOSED); - game_control_value[GAME_CONTROL_TIMEGATE_SWITCH_TIME] = + game_panel_controls[GAME_PANEL_TIMEGATE_SWITCH_TIME].value = game.timegate_time_left; - /* !!! TODO !!! */ - game_control_value[GAME_CONTROL_SWITCHGATE_SWITCH] = EL_UNDEFINED; + game_panel_controls[GAME_PANEL_SWITCHGATE_SWITCH].value = + EL_SWITCHGATE_SWITCH_UP + game.switchgate_pos; - game_control_value[GAME_CONTROL_EMC_LENSES] = + game_panel_controls[GAME_PANEL_EMC_LENSES].value = (game.lenses_time_left > 0 ? EL_EMC_LENSES : EL_EMPTY); - game_control_value[GAME_CONTROL_EMC_LENSES_TIME] = game.lenses_time_left; + game_panel_controls[GAME_PANEL_EMC_LENSES_TIME].value = + game.lenses_time_left; - game_control_value[GAME_CONTROL_EMC_MAGNIFIER] = + game_panel_controls[GAME_PANEL_EMC_MAGNIFIER].value = (game.magnify_time_left > 0 ? EL_EMC_MAGNIFIER : EL_EMPTY); - game_control_value[GAME_CONTROL_EMC_MAGNIFIER_TIME] = game.magnify_time_left; + game_panel_controls[GAME_PANEL_EMC_MAGNIFIER_TIME].value = + game.magnify_time_left; - game_control_value[GAME_CONTROL_BALLOON_SWITCH] = + game_panel_controls[GAME_PANEL_BALLOON_SWITCH].value = (game.wind_direction == MV_LEFT ? EL_BALLOON_SWITCH_LEFT : game.wind_direction == MV_RIGHT ? EL_BALLOON_SWITCH_RIGHT : game.wind_direction == MV_UP ? EL_BALLOON_SWITCH_UP : game.wind_direction == MV_DOWN ? EL_BALLOON_SWITCH_DOWN : EL_BALLOON_SWITCH_NONE); - game_control_value[GAME_CONTROL_DYNABOMB_NUMBER] = + game_panel_controls[GAME_PANEL_DYNABOMB_NUMBER].value = local_player->dynabomb_count; - game_control_value[GAME_CONTROL_DYNABOMB_SIZE] = + game_panel_controls[GAME_PANEL_DYNABOMB_SIZE].value = local_player->dynabomb_size; - game_control_value[GAME_CONTROL_DYNABOMB_POWER] = + game_panel_controls[GAME_PANEL_DYNABOMB_POWER].value = (local_player->dynabomb_xl ? EL_DYNABOMB_INCREASE_POWER : EL_EMPTY); - game_control_value[GAME_CONTROL_PENGUINS] = + game_panel_controls[GAME_PANEL_PENGUINS].value = local_player->friends_still_needed; - game_control_value[GAME_CONTROL_SOKOBAN_OBJECTS] = + game_panel_controls[GAME_PANEL_SOKOBAN_OBJECTS].value = local_player->sokobanfields_still_needed; - game_control_value[GAME_CONTROL_SOKOBAN_FIELDS] = + game_panel_controls[GAME_PANEL_SOKOBAN_FIELDS].value = local_player->sokobanfields_still_needed; - /* !!! TODO !!! */ - game_control_value[GAME_CONTROL_ROBOT_WHEEL] = EL_UNDEFINED; - - /* !!! TODO !!! */ - game_control_value[GAME_CONTROL_CONVEYOR_BELT_1] = EL_UNDEFINED; - game_control_value[GAME_CONTROL_CONVEYOR_BELT_1_SWITCH] = EL_UNDEFINED; - game_control_value[GAME_CONTROL_CONVEYOR_BELT_2] = EL_UNDEFINED; - game_control_value[GAME_CONTROL_CONVEYOR_BELT_2_SWITCH] = EL_UNDEFINED; - game_control_value[GAME_CONTROL_CONVEYOR_BELT_3] = EL_UNDEFINED; - game_control_value[GAME_CONTROL_CONVEYOR_BELT_3_SWITCH] = EL_UNDEFINED; - game_control_value[GAME_CONTROL_CONVEYOR_BELT_4] = EL_UNDEFINED; - game_control_value[GAME_CONTROL_CONVEYOR_BELT_4_SWITCH] = EL_UNDEFINED; - - /* !!! TODO !!! */ - game_control_value[GAME_CONTROL_MAGIC_WALL] = EL_UNDEFINED; - game_control_value[GAME_CONTROL_MAGIC_WALL_TIME] = + game_panel_controls[GAME_PANEL_ROBOT_WHEEL].value = + (game.robot_wheel_active ? EL_ROBOT_WHEEL_ACTIVE : EL_ROBOT_WHEEL); + + for (i = 0; i < NUM_BELTS; i++) + { + game_panel_controls[GAME_PANEL_CONVEYOR_BELT_1 + i].value = + (game.belt_dir[i] != MV_NONE ? EL_CONVEYOR_BELT_1_MIDDLE_ACTIVE : + EL_CONVEYOR_BELT_1_MIDDLE) + i; + game_panel_controls[GAME_PANEL_CONVEYOR_BELT_1_SWITCH + i].value = + getBeltSwitchElementFromBeltNrAndBeltDir(i, game.belt_dir[i]); + } + + game_panel_controls[GAME_PANEL_MAGIC_WALL].value = + (game.magic_wall_active ? EL_MAGIC_WALL_ACTIVE : EL_MAGIC_WALL); + game_panel_controls[GAME_PANEL_MAGIC_WALL_TIME].value = game.magic_wall_time_left; - game_control_value[GAME_CONTROL_BD_MAGIC_WALL] = EL_UNDEFINED; - game_control_value[GAME_CONTROL_DC_MAGIC_WALL] = EL_UNDEFINED; - game_control_value[GAME_CONTROL_PLAYER_NAME] = 0; - game_control_value[GAME_CONTROL_LEVEL_NAME] = 0; - game_control_value[GAME_CONTROL_LEVEL_AUTHOR] = 0; +#if USE_PLAYER_GRAVITY + game_panel_controls[GAME_PANEL_GRAVITY_STATE].value = + local_player->gravity; +#else + game_panel_controls[GAME_PANEL_GRAVITY_STATE].value = game.gravity; +#endif + + for (i = 0; i < NUM_PANEL_CE_SCORE; i++) + { + if (game.panel.ce_score[i].id != EL_UNDEFINED) + { + int ce_score = element_info[game.panel.ce_score[i].id].collect_score; + + game_panel_controls[GAME_PANEL_CE_SCORE_1 + i].value = ce_score; + game_panel_controls[GAME_PANEL_CE_SCORE_1_ELEMENT + i].value = ce_score; + } + else + { + game_panel_controls[GAME_PANEL_CE_SCORE_1 + i].value = 0; + game_panel_controls[GAME_PANEL_CE_SCORE_1_ELEMENT + i].value = 0; + } + } + + game_panel_controls[GAME_PANEL_PLAYER_NAME].value = 0; + game_panel_controls[GAME_PANEL_LEVEL_NAME].value = 0; + game_panel_controls[GAME_PANEL_LEVEL_AUTHOR].value = 0; + + for (i = 0; game_panel_controls[i].nr != -1; i++) + { + struct GamePanelControlInfo *gpc = &game_panel_controls[i]; + + if (gpc->type == TYPE_ELEMENT) + { + if (gpc->value != gpc->last_value) + gpc->gfx_frame = 0; + else + gpc->gfx_frame++; + + gpc->frame = getGraphicAnimationFrame(el2panelimg(gpc->value), + gpc->gfx_frame); + } + } } void DisplayGameControlValues() { int i; - for (i = 0; game_controls[i].nr != -1; i++) + game_status = GAME_MODE_PSEUDO_PANEL; + + for (i = 0; game_panel_controls[i].nr != -1; i++) { - int nr = game_controls[i].nr; - int type = game_controls[i].type; - struct TextPosInfo *pos = game_controls[i].pos; - int value = game_control_value[nr]; - int last_value = last_game_control_value[nr]; - int chars = pos->chars; + struct GamePanelControlInfo *gpc = &game_panel_controls[i]; + int nr = gpc->nr; + int type = gpc->type; + struct TextPosInfo *pos = gpc->pos; + int value = gpc->value; + int frame = gpc->frame; + int last_value = gpc->last_value; + int last_frame = gpc->last_frame; + int size = pos->size; int font = pos->font; - if (value == last_value) + if (value == last_value && frame == last_frame) continue; - last_game_control_value[nr] = value; + gpc->last_value = value; + gpc->last_frame = frame; #if 0 printf("::: value %d changed from %d to %d\n", nr, last_value, value); @@ -1948,26 +2163,27 @@ void DisplayGameControlValues() if (type == TYPE_INTEGER) { - if (nr == GAME_CONTROL_LEVEL_NUMBER || nr == GAME_CONTROL_TIME) + if (nr == GAME_PANEL_LEVEL_NUMBER || + nr == GAME_PANEL_TIME) { - boolean use_dynamic_chars = (pos->chars == -1 ? TRUE : FALSE); + boolean use_dynamic_size = (size == -1 ? TRUE : FALSE); - if (use_dynamic_chars) /* use dynamic number of chars */ + if (use_dynamic_size) /* use dynamic number of digits */ { - int value_change = (nr == GAME_CONTROL_LEVEL_NUMBER ? 100 : 1000); - int chars1 = (nr == GAME_CONTROL_LEVEL_NUMBER ? 2 : 3); - int chars2 = chars1 + 1; + int value_change = (nr == GAME_PANEL_LEVEL_NUMBER ? 100 : 1000); + int size1 = (nr == GAME_PANEL_LEVEL_NUMBER ? 2 : 3); + int size2 = size1 + 1; int font1 = pos->font; int font2 = pos->font_alt; - chars = (value < value_change ? chars1 : chars2); - font = (value < value_change ? font1 : font2); + size = (value < value_change ? size1 : size2); + font = (value < value_change ? font1 : font2); - /* clear background if value just changed its size (dynamic chars) */ + /* clear background if value just changed its size (dynamic digits) */ if ((last_value < value_change) != (value < value_change)) { - int width1 = chars1 * getFontWidth(font1); - int width2 = chars2 * getFontWidth(font2); + int width1 = size1 * getFontWidth(font1); + int width2 = size2 * getFontWidth(font2); int max_width = MAX(width1, width2); int max_height = MAX(getFontHeight(font1), getFontHeight(font2)); @@ -1977,43 +2193,99 @@ void DisplayGameControlValues() max_width, max_height); } } - - pos->width = chars * getFontWidth(font); } - DrawText(PANEL_XPOS(pos), PANEL_YPOS(pos), int2str(value, chars), font); +#if 1 + /* correct text size if "digits" is zero or less */ + if (size <= 0) + size = strlen(int2str(value, size)); + + /* dynamically correct text alignment */ + pos->width = size * getFontWidth(font); +#endif + + DrawText(PANEL_XPOS(pos), PANEL_YPOS(pos), int2str(value, size), font); } else if (type == TYPE_ELEMENT) { + int element, graphic; + Bitmap *src_bitmap; + int src_x, src_y; + int width, height; int dst_x = PANEL_XPOS(pos); int dst_y = PANEL_YPOS(pos); if (value == EL_UNDEFINED || value == EL_EMPTY) { - int src_x = DOOR_GFX_PAGEX5 + ALIGNED_TEXT_XPOS(pos); - int src_y = DOOR_GFX_PAGEY1 + ALIGNED_TEXT_YPOS(pos); + element = (last_value == EL_UNDEFINED ? EL_EMPTY : last_value); + graphic = el2panelimg(element); - BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, src_x, src_y, - MINI_TILEX, MINI_TILEY, dst_x, dst_y); + src_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap; + src_x = DOOR_GFX_PAGEX5 + ALIGNED_TEXT_XPOS(pos); + src_y = DOOR_GFX_PAGEY1 + ALIGNED_TEXT_YPOS(pos); } else { - int graphic = el2edimg(value); + element = value; + graphic = el2panelimg(value); - DrawMiniGraphicExt(drawto, dst_x, dst_y, graphic); + getSizedGraphicSource(graphic, frame, size, &src_bitmap, &src_x,&src_y); } + + width = graphic_info[graphic].width * size / TILESIZE; + height = graphic_info[graphic].height * size / TILESIZE; + + BlitBitmap(src_bitmap, drawto, src_x, src_y, width, height, dst_x, dst_y); } else if (type == TYPE_STRING) { - char *s = (nr == GAME_CONTROL_PLAYER_NAME ? setup.player_name : - nr == GAME_CONTROL_LEVEL_NAME ? level.name : - nr == GAME_CONTROL_LEVEL_AUTHOR ? level.author : NULL); + boolean active = (value != 0); + char *state_normal = "off"; + char *state_active = "on"; + char *state = (active ? state_active : state_normal); + char *s = (nr == GAME_PANEL_GRAVITY_STATE ? state : + nr == GAME_PANEL_PLAYER_NAME ? setup.player_name : + nr == GAME_PANEL_LEVEL_NAME ? level.name : + nr == GAME_PANEL_LEVEL_AUTHOR ? level.author : NULL); + + if (nr == GAME_PANEL_GRAVITY_STATE) + { + int font1 = pos->font; /* (used for normal state) */ + int font2 = pos->font_alt; /* (used for active state) */ + int size1 = strlen(state_normal); + int size2 = strlen(state_active); + int width1 = size1 * getFontWidth(font1); + int width2 = size2 * getFontWidth(font2); + int max_width = MAX(width1, width2); + int max_height = MAX(getFontHeight(font1), getFontHeight(font2)); + + pos->width = max_width; + + /* clear background for values that may have changed its size */ + ClearRectangleOnBackground(drawto, PANEL_XPOS(pos), PANEL_YPOS(pos), + max_width, max_height); + + font = (active ? font2 : font1); + } if (s != NULL) { - char *s_cut = getStringCopyN(s, pos->chars); + char *s_cut; + +#if 1 + if (size <= 0) + { + /* don't truncate output if "chars" is zero or less */ + size = strlen(s); + + /* dynamically correct text alignment */ + pos->width = size * getFontWidth(font); + } +#endif + + s_cut = getStringCopyN(s, size); - DrawText(PANEL_XPOS(pos), PANEL_YPOS(pos), s_cut, pos->font); + DrawText(PANEL_XPOS(pos), PANEL_YPOS(pos), s_cut, font); free(s_cut); } @@ -2021,6 +2293,8 @@ void DisplayGameControlValues() redraw_mask |= REDRAW_DOOR_1; } + + game_status = GAME_MODE_PLAYING; } void DrawGameValue_Emeralds(int value) @@ -2032,7 +2306,7 @@ void DrawGameValue_Emeralds(int value) int font_nr = FONT_TEXT_2; #endif int font_width = getFontWidth(font_nr); - int chars = pos->chars; + int chars = pos->size; #if 1 return; /* !!! USE NEW STUFF !!! */ @@ -2048,14 +2322,14 @@ void DrawGameValue_Emeralds(int value) void DrawGameValue_Dynamite(int value) { - struct TextPosInfo *pos = &game.panel.inventory; + struct TextPosInfo *pos = &game.panel.inventory_count; #if 1 int font_nr = pos->font; #else int font_nr = FONT_TEXT_2; #endif int font_width = getFontWidth(font_nr); - int chars = pos->chars; + int chars = pos->size; #if 1 return; /* !!! USE NEW STUFF !!! */ @@ -2078,7 +2352,7 @@ void DrawGameValue_Score(int value) int font_nr = FONT_TEXT_2; #endif int font_width = getFontWidth(font_nr); - int chars = pos->chars; + int chars = pos->size; #if 1 return; /* !!! USE NEW STUFF !!! */ @@ -2098,7 +2372,7 @@ void DrawGameValue_Time(int value) static int last_value = -1; int chars1 = 3; int chars2 = 4; - int chars = pos->chars; + int chars = pos->size; #if 1 int font1_nr = pos->font; int font2_nr = pos->font_alt; @@ -2148,7 +2422,7 @@ void DrawGameValue_Level(int value) struct TextPosInfo *pos = &game.panel.level_number; int chars1 = 2; int chars2 = 3; - int chars = pos->chars; + int chars = pos->size; #if 1 int font1_nr = pos->font; int font2_nr = pos->font_alt; @@ -2296,7 +2570,7 @@ void DrawGameValue_Dynamite(int value) int font_nr = FONT_TEXT_2; int xpos = (3 * 14 - 3 * getFontWidth(font_nr)) / 2; - if (PANEL_DEACTIVATED(game.panel.inventory)) + if (PANEL_DEACTIVATED(game.panel.inventory_count)) return; DrawText(DX_DYNAMITE + xpos, DY_DYNAMITE, int2str(value, 3), font_nr); @@ -2406,9 +2680,13 @@ void DrawAllGameValues(int emeralds, int dynamite, int score, int time, DrawGameValue_Keys(key); } -void DrawGameDoorValues() +void UpdateGameDoorValues() { UpdateGameControlValues(); +} + +void DrawGameDoorValues() +{ DisplayGameControlValues(); } @@ -3094,6 +3372,7 @@ void InitGame() AllPlayersGone = FALSE; game.yamyam_content_nr = 0; + game.robot_wheel_active = FALSE; game.magic_wall_active = FALSE; game.magic_wall_time_left = 0; game.light_time_left = 0; @@ -3487,6 +3766,9 @@ void InitGame() local_player->jy - MIDPOSY); } + /* do not use PLAYING mask for fading out from main screen */ + game_status = GAME_MODE_MAIN; + StopAnimation(); if (!game.restart_level) @@ -3511,6 +3793,8 @@ void InitGame() FadeOut(REDRAW_FIELD); #endif + game_status = GAME_MODE_PLAYING; + /* !!! FIX THIS (START) !!! */ if (level.game_engine_type == GAME_ENGINE_TYPE_EM) { @@ -3555,6 +3839,7 @@ void InitGame() SetPanelBackground(); SetDrawBackgroundMask(REDRAW_DOOR_1); + UpdateGameDoorValues(); DrawGameDoorValues(); if (!game.restart_level) @@ -3867,8 +4152,8 @@ void GameWon() score = score_final; #if 1 - game_control_value[GAME_CONTROL_TIME] = time; - game_control_value[GAME_CONTROL_SCORE] = score; + game_panel_controls[GAME_PANEL_TIME].value = time; + game_panel_controls[GAME_PANEL_SCORE].value = score; DisplayGameControlValues(); #else @@ -3949,8 +4234,8 @@ void GameWon() score += time_count_steps * level.score[SC_TIME_BONUS]; #if 1 - game_control_value[GAME_CONTROL_TIME] = time; - game_control_value[GAME_CONTROL_SCORE] = score; + game_panel_controls[GAME_PANEL_TIME].value = time; + game_panel_controls[GAME_PANEL_SCORE].value = score; DisplayGameControlValues(); #else @@ -5299,12 +5584,19 @@ static void InitBeltMovement() for (j = 0; j < NUM_BELT_PARTS; j++) { int element = belt_base_active_element[belt_nr] + j; - int graphic = el2img(element); + int graphic_1 = el2img(element); + int graphic_2 = el2panelimg(element); if (game.belt_dir[i] == MV_LEFT) - graphic_info[graphic].anim_mode &= ~ANIM_REVERSE; + { + graphic_info[graphic_1].anim_mode &= ~ANIM_REVERSE; + graphic_info[graphic_2].anim_mode &= ~ANIM_REVERSE; + } else - graphic_info[graphic].anim_mode |= ANIM_REVERSE; + { + graphic_info[graphic_1].anim_mode |= ANIM_REVERSE; + graphic_info[graphic_2].anim_mode |= ANIM_REVERSE; + } } } @@ -5380,12 +5672,19 @@ static void ToggleBeltSwitch(int x, int y) for (i = 0; i < NUM_BELT_PARTS; i++) { int element = belt_base_active_element[belt_nr] + i; - int graphic = el2img(element); + int graphic_1 = el2img(element); + int graphic_2 = el2panelimg(element); if (belt_dir == MV_LEFT) - graphic_info[graphic].anim_mode &= ~ANIM_REVERSE; + { + graphic_info[graphic_1].anim_mode &= ~ANIM_REVERSE; + graphic_info[graphic_2].anim_mode &= ~ANIM_REVERSE; + } else - graphic_info[graphic].anim_mode |= ANIM_REVERSE; + { + graphic_info[graphic_1].anim_mode |= ANIM_REVERSE; + graphic_info[graphic_2].anim_mode |= ANIM_REVERSE; + } } SCAN_PLAYFIELD(xx, yy) @@ -8628,7 +8927,11 @@ static void RunRobotWheel(int x, int y) static void StopRobotWheel(int x, int y) { if (ZX == x && ZY == y) + { ZX = ZY = -1; + + game.robot_wheel_active = FALSE; + } } static void InitTimegateWheel(int x, int y) @@ -9391,7 +9694,7 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page) TimeLeft = action_arg_number_new; #if 1 - game_control_value[GAME_CONTROL_TIME] = TimeLeft; + game_panel_controls[GAME_PANEL_TIME].value = TimeLeft; DisplayGameControlValues(); #else @@ -9411,7 +9714,7 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page) local_player->score = action_arg_number_new; #if 1 - game_control_value[GAME_CONTROL_SCORE] = local_player->score; + game_panel_controls[GAME_PANEL_SCORE].value = local_player->score; DisplayGameControlValues(); #else @@ -9426,7 +9729,7 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page) local_player->gems_still_needed = action_arg_number_new; #if 1 - game_control_value[GAME_CONTROL_GEMS] = local_player->gems_still_needed; + game_panel_controls[GAME_PANEL_GEMS].value = local_player->gems_still_needed; DisplayGameControlValues(); #else @@ -10707,7 +11010,7 @@ static void CheckLevelTime() PlaySound(SND_GAME_RUNNING_OUT_OF_TIME); #if 1 - game_control_value[GAME_CONTROL_TIME] = TimeLeft; + game_panel_controls[GAME_PANEL_TIME].value = TimeLeft; DisplayGameControlValues(); #else @@ -10726,7 +11029,7 @@ static void CheckLevelTime() #if 1 else if (level.time == 0 && !AllPlayersGone) /* level w/o time limit */ { - game_control_value[GAME_CONTROL_TIME] = TimePlayed; + game_panel_controls[GAME_PANEL_TIME].value = TimePlayed; DisplayGameControlValues(); } @@ -10743,6 +11046,7 @@ static void CheckLevelTime() DrawVideoDisplay(VIDEO_STATE_TIME_ON, TapeTime); } + UpdateGameDoorValues(); DrawGameDoorValues(); } @@ -11610,6 +11914,7 @@ void GameActions_RND() if (game.magic_wall_time_left > 0) { game.magic_wall_time_left--; + if (!game.magic_wall_time_left) { SCAN_PLAYFIELD(x, y) @@ -12460,7 +12765,7 @@ void ScrollPlayer(struct PlayerInfo *player, int mode) PlaySound(SND_GAME_RUNNING_OUT_OF_TIME); #if 1 - game_control_value[GAME_CONTROL_TIME] = TimeLeft; + game_panel_controls[GAME_PANEL_TIME].value = TimeLeft; DisplayGameControlValues(); #else @@ -12474,7 +12779,7 @@ void ScrollPlayer(struct PlayerInfo *player, int mode) #if 1 else if (level.time == 0 && !AllPlayersGone) /* level w/o time limit */ { - game_control_value[GAME_CONTROL_TIME] = TimePlayed; + game_panel_controls[GAME_PANEL_TIME].value = TimePlayed; DisplayGameControlValues(); } @@ -13532,7 +13837,7 @@ int DigField(struct PlayerInfo *player, TimeLeft += level.extra_time; #if 1 - game_control_value[GAME_CONTROL_TIME] = TimeLeft; + game_panel_controls[GAME_PANEL_TIME].value = TimeLeft; DisplayGameControlValues(); #else @@ -13617,7 +13922,7 @@ int DigField(struct PlayerInfo *player, local_player->gems_still_needed = 0; #if 1 - game_control_value[GAME_CONTROL_GEMS] = local_player->gems_still_needed; + game_panel_controls[GAME_PANEL_GEMS].value = local_player->gems_still_needed; DisplayGameControlValues(); #else @@ -13802,6 +14107,8 @@ int DigField(struct PlayerInfo *player, ZX = x; ZY = y; + game.robot_wheel_active = TRUE; + DrawLevelField(x, y); } else if (element == EL_SP_TERMINAL) @@ -13868,7 +14175,7 @@ int DigField(struct PlayerInfo *player, TimeLeft += level.time_orb_time; #if 1 - game_control_value[GAME_CONTROL_TIME] = TimeLeft; + game_panel_controls[GAME_PANEL_TIME].value = TimeLeft; DisplayGameControlValues(); #else @@ -14045,6 +14352,9 @@ boolean DropElement(struct PlayerInfo *player) int dropx = player->jx, dropy = player->jy; int drop_direction = player->MovDir; int drop_side = drop_direction; +#if 1 + int drop_element = get_next_dropped_element(player); +#else int drop_element = (player->inventory_size > 0 ? player->inventory_element[player->inventory_size - 1] : player->inventory_infinite_element != EL_UNDEFINED ? @@ -14052,6 +14362,7 @@ boolean DropElement(struct PlayerInfo *player) player->dynabombs_left > 0 ? EL_DYNABOMB_PLAYER_1_ACTIVE + player->index_nr : EL_UNDEFINED); +#endif player->is_dropping_pressed = TRUE; @@ -14496,7 +14807,7 @@ void RaiseScore(int value) local_player->score += value; #if 1 - game_control_value[GAME_CONTROL_SCORE] = local_player->score; + game_panel_controls[GAME_PANEL_SCORE].value = local_player->score; DisplayGameControlValues(); #else