X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=1da4c96d663b5cc861c746ebd2f8a234a86bca8f;hb=8f057caae2acbc12afff54102ffa4a2568b8f8c6;hp=c7469e7e174838b4e0dfa007890f66f4a6acaecb;hpb=585994e9f3f77300b730f790062010518f35a739;p=rocksndiamonds.git diff --git a/src/conf_gfx.c b/src/conf_gfx.c index c7469e7e..1da4c96d 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -4690,8 +4690,8 @@ struct ConfigInfo image_config[] = { "font.text_1.active.SCORES.y", "0" }, { "font.text_1.active.SCORES.width", "16" }, { "font.text_1.active.SCORES.height", "32" }, - { "font.text_1.PLAYING", UNDEFINED_FILENAME }, - { "font.text_1.PLAYING.clone_from", "font.level_number" }, + { "font.text_1.PANEL", UNDEFINED_FILENAME }, + { "font.text_1.PANEL.clone_from", "font.level_number" }, { "font.text_1.DOOR", UNDEFINED_FILENAME }, { "font.text_1.DOOR.clone_from", "font.level_number" }, { "font.text_2", "RocksFontSmall.pcx" }, @@ -5376,16 +5376,19 @@ struct ConfigInfo image_config[] = { "main.text.first_level.y", "98" }, { "main.text.first_level.align", "left" }, { "main.text.first_level.valign", "top" }, + { "main.text.first_level.digits", "3" }, { "main.text.first_level.font", "font.text_3" }, { "main.text.last_level.x", "488" }, { "main.text.last_level.y", "112" }, { "main.text.last_level.align", "left" }, { "main.text.last_level.valign", "top" }, + { "main.text.last_level.digits", "3" }, { "main.text.last_level.font", "font.text_3" }, { "main.text.level_number.x", "352" }, { "main.text.level_number.y", "96" }, { "main.text.level_number.align", "left" }, { "main.text.level_number.valign", "top" }, + { "main.text.level_number.digits", "3" }, { "main.text.level_number.font", "font.value_1" }, { "main.text.level_info_1.x", "272" }, { "main.text.level_info_1.y", "352" }, @@ -5416,7 +5419,7 @@ struct ConfigInfo image_config[] = { "main.text.level_year.y", "-1" }, { "main.text.level_year.align", "left" }, { "main.text.level_year.valign", "top" }, - { "main.text.level_year.chars", "-1" }, + { "main.text.level_year.digits", "-1" }, { "main.text.level_year.font", "font.text_2" }, { "main.text.level_imported_from.x", "-1" }, { "main.text.level_imported_from.y", "-1" }, @@ -5487,7 +5490,7 @@ struct ConfigInfo image_config[] = { "game.panel.level_number.y", "20" }, { "game.panel.level_number.align", "center" }, { "game.panel.level_number.valign", "top" }, - { "game.panel.level_number.chars", "-1" }, + { "game.panel.level_number.digits", "-1" }, { "game.panel.level_number.font", "font.text_2" }, { "game.panel.level_number.font_narrow", "font.text_1" }, @@ -5495,53 +5498,112 @@ struct ConfigInfo image_config[] = { "game.panel.gems.y", "54" }, { "game.panel.gems.align", "center" }, { "game.panel.gems.valign", "top" }, - { "game.panel.gems.chars", "3" }, + { "game.panel.gems.digits", "3" }, { "game.panel.gems.font", "font.text_2" }, - { "game.panel.inventory.x", "50" }, - { "game.panel.inventory.y", "89" }, - { "game.panel.inventory.align", "center" }, - { "game.panel.inventory.valign", "top" }, - { "game.panel.inventory.chars", "3" }, - { "game.panel.inventory.font", "font.text_2" }, + { "game.panel.inventory_count.x", "50" }, + { "game.panel.inventory_count.y", "89" }, + { "game.panel.inventory_count.align", "center" }, + { "game.panel.inventory_count.valign", "top" }, + { "game.panel.inventory_count.digits", "3" }, + { "game.panel.inventory_count.font", "font.text_2" }, + + { "game.panel.inventory_first_1.x", "-1" }, + { "game.panel.inventory_first_1.y", "-1" }, + { "game.panel.inventory_first_1.tile_size", "16" }, + { "game.panel.inventory_first_2.x", "-1" }, + { "game.panel.inventory_first_2.y", "-1" }, + { "game.panel.inventory_first_2.tile_size", "16" }, + { "game.panel.inventory_first_3.x", "-1" }, + { "game.panel.inventory_first_3.y", "-1" }, + { "game.panel.inventory_first_3.tile_size", "16" }, + { "game.panel.inventory_first_4.x", "-1" }, + { "game.panel.inventory_first_4.y", "-1" }, + { "game.panel.inventory_first_4.tile_size", "16" }, + { "game.panel.inventory_first_5.x", "-1" }, + { "game.panel.inventory_first_5.y", "-1" }, + { "game.panel.inventory_first_5.tile_size", "16" }, + { "game.panel.inventory_first_6.x", "-1" }, + { "game.panel.inventory_first_6.y", "-1" }, + { "game.panel.inventory_first_6.tile_size", "16" }, + { "game.panel.inventory_first_7.x", "-1" }, + { "game.panel.inventory_first_7.y", "-1" }, + { "game.panel.inventory_first_7.tile_size", "16" }, + { "game.panel.inventory_first_8.x", "-1" }, + { "game.panel.inventory_first_8.y", "-1" }, + { "game.panel.inventory_first_8.tile_size", "16" }, + + { "game.panel.inventory_last_1.x", "-1" }, + { "game.panel.inventory_last_1.y", "-1" }, + { "game.panel.inventory_last_1.tile_size", "16" }, + { "game.panel.inventory_last_2.x", "-1" }, + { "game.panel.inventory_last_2.y", "-1" }, + { "game.panel.inventory_last_2.tile_size", "16" }, + { "game.panel.inventory_last_3.x", "-1" }, + { "game.panel.inventory_last_3.y", "-1" }, + { "game.panel.inventory_last_3.tile_size", "16" }, + { "game.panel.inventory_last_4.x", "-1" }, + { "game.panel.inventory_last_4.y", "-1" }, + { "game.panel.inventory_last_4.tile_size", "16" }, + { "game.panel.inventory_last_5.x", "-1" }, + { "game.panel.inventory_last_5.y", "-1" }, + { "game.panel.inventory_last_5.tile_size", "16" }, + { "game.panel.inventory_last_6.x", "-1" }, + { "game.panel.inventory_last_6.y", "-1" }, + { "game.panel.inventory_last_6.tile_size", "16" }, + { "game.panel.inventory_last_7.x", "-1" }, + { "game.panel.inventory_last_7.y", "-1" }, + { "game.panel.inventory_last_7.tile_size", "16" }, + { "game.panel.inventory_last_8.x", "-1" }, + { "game.panel.inventory_last_8.y", "-1" }, + { "game.panel.inventory_last_8.tile_size", "16" }, { "game.panel.key_1.x", "18" }, { "game.panel.key_1.y", "123" }, + { "game.panel.key_1.tile_size", "16" }, { "game.panel.key_2.x", "34" }, { "game.panel.key_2.y", "123" }, + { "game.panel.key_2.tile_size", "16" }, { "game.panel.key_3.x", "50" }, { "game.panel.key_3.y", "123" }, + { "game.panel.key_3.tile_size", "16" }, { "game.panel.key_4.x", "66" }, { "game.panel.key_4.y", "123" }, + { "game.panel.key_4.tile_size", "16" }, { "game.panel.key_5.x", "-1" }, { "game.panel.key_5.y", "-1" }, + { "game.panel.key_5.tile_size", "16" }, { "game.panel.key_6.x", "-1" }, { "game.panel.key_6.y", "-1" }, + { "game.panel.key_6.tile_size", "16" }, { "game.panel.key_7.x", "-1" }, { "game.panel.key_7.y", "-1" }, + { "game.panel.key_7.tile_size", "16" }, { "game.panel.key_8.x", "-1" }, { "game.panel.key_8.y", "-1" }, + { "game.panel.key_8.tile_size", "16" }, { "game.panel.key_white.x", "-1" }, { "game.panel.key_white.y", "-1" }, + { "game.panel.key_white.tile_size", "16" }, { "game.panel.key_white_count.x", "-1" }, { "game.panel.key_white_count.y", "-1" }, { "game.panel.key_white_count.align", "left" }, { "game.panel.key_white_count.valign", "top" }, - { "game.panel.key_white_count.chars", "-1" }, + { "game.panel.key_white_count.digits", "-1" }, { "game.panel.key_white_count.font", "font.text_2" }, { "game.panel.score.x", "50" }, { "game.panel.score.y", "159" }, { "game.panel.score.align", "center" }, { "game.panel.score.valign", "top" }, - { "game.panel.score.chars", "5" }, + { "game.panel.score.digits", "5" }, { "game.panel.score.font", "font.text_2" }, { "game.panel.time.x", "50" }, { "game.panel.time.y", "194" }, { "game.panel.time.align", "center" }, { "game.panel.time.valign", "top" }, - { "game.panel.time.chars", "-1" }, + { "game.panel.time.digits", "-1" }, { "game.panel.time.font", "font.text_2" }, { "game.panel.time.font_narrow", "font.text_1" }, @@ -5549,180 +5611,181 @@ struct ConfigInfo image_config[] = { "game.panel.time_hh.y", "-1" }, { "game.panel.time_hh.align", "left" }, { "game.panel.time_hh.valign", "top" }, - { "game.panel.time_hh.chars", "-1" }, + { "game.panel.time_hh.digits", "2" }, { "game.panel.time_hh.font", "font.text_2" }, { "game.panel.time_mm.x", "-1" }, { "game.panel.time_mm.y", "-1" }, { "game.panel.time_mm.align", "left" }, { "game.panel.time_mm.valign", "top" }, - { "game.panel.time_mm.chars", "-1" }, + { "game.panel.time_mm.digits", "2" }, { "game.panel.time_mm.font", "font.text_2" }, { "game.panel.time_ss.x", "-1" }, { "game.panel.time_ss.y", "-1" }, { "game.panel.time_ss.align", "left" }, { "game.panel.time_ss.valign", "top" }, - { "game.panel.time_ss.chars", "-1" }, + { "game.panel.time_ss.digits", "2" }, { "game.panel.time_ss.font", "font.text_2" }, - { "game.panel.drop_next_1.x", "-1" }, - { "game.panel.drop_next_1.y", "-1" }, - { "game.panel.drop_next_2.x", "-1" }, - { "game.panel.drop_next_2.y", "-1" }, - { "game.panel.drop_next_3.x", "-1" }, - { "game.panel.drop_next_3.y", "-1" }, - { "game.panel.drop_next_4.x", "-1" }, - { "game.panel.drop_next_4.y", "-1" }, - { "game.panel.drop_next_5.x", "-1" }, - { "game.panel.drop_next_5.y", "-1" }, - { "game.panel.drop_next_6.x", "-1" }, - { "game.panel.drop_next_6.y", "-1" }, - { "game.panel.drop_next_7.x", "-1" }, - { "game.panel.drop_next_7.y", "-1" }, - { "game.panel.drop_next_8.x", "-1" }, - { "game.panel.drop_next_8.y", "-1" }, - { "game.panel.shield_normal.x", "-1" }, { "game.panel.shield_normal.y", "-1" }, + { "game.panel.shield_normal.tile_size", "16" }, { "game.panel.shield_normal_time.x", "-1" }, { "game.panel.shield_normal_time.y", "-1" }, { "game.panel.shield_normal_time.align", "left" }, { "game.panel.shield_normal_time.valign", "top" }, - { "game.panel.shield_normal_time.chars", "-1" }, + { "game.panel.shield_normal_time.digits", "-1" }, { "game.panel.shield_normal_time.font", "font.text_2" }, { "game.panel.shield_deadly.x", "-1" }, { "game.panel.shield_deadly.y", "-1" }, + { "game.panel.shield_deadly.tile_size", "16" }, { "game.panel.shield_deadly_time.x", "-1" }, { "game.panel.shield_deadly_time.y", "-1" }, { "game.panel.shield_deadly_time.align", "left" }, { "game.panel.shield_deadly_time.valign", "top" }, - { "game.panel.shield_deadly_time.chars", "-1" }, + { "game.panel.shield_deadly_time.digits", "-1" }, { "game.panel.shield_deadly_time.font", "font.text_2" }, { "game.panel.exit.x", "-1" }, { "game.panel.exit.y", "-1" }, - { "game.panel.em_exit.x", "-1" }, - { "game.panel.em_exit.y", "-1" }, - { "game.panel.sp_exit.x", "-1" }, - { "game.panel.sp_exit.y", "-1" }, - { "game.panel.steel_exit.x", "-1" }, - { "game.panel.steel_exit.y", "-1" }, - { "game.panel.em_steel_exit.x", "-1" }, - { "game.panel.em_steel_exit.y", "-1" }, + { "game.panel.exit.tile_size", "16" }, { "game.panel.emc_magic_ball.x", "-1" }, { "game.panel.emc_magic_ball.y", "-1" }, + { "game.panel.emc_magic_ball.tile_size", "16" }, { "game.panel.emc_magic_ball_switch.x", "-1" }, { "game.panel.emc_magic_ball_switch.y", "-1" }, + { "game.panel.emc_magic_ball_switch.tile_size", "16" }, { "game.panel.light_switch.x", "-1" }, { "game.panel.light_switch.y", "-1" }, + { "game.panel.light_switch.tile_size", "16" }, { "game.panel.light_switch_time.x", "-1" }, { "game.panel.light_switch_time.y", "-1" }, { "game.panel.light_switch_time.align", "left" }, { "game.panel.light_switch_time.valign", "top" }, - { "game.panel.light_switch_time.chars", "-1" }, + { "game.panel.light_switch_time.digits", "-1" }, { "game.panel.light_switch_time.font", "font.text_2" }, { "game.panel.timegate_switch.x", "-1" }, { "game.panel.timegate_switch.y", "-1" }, + { "game.panel.timegate_switch.tile_size", "16" }, { "game.panel.timegate_switch_time.x", "-1" }, { "game.panel.timegate_switch_time.y", "-1" }, { "game.panel.timegate_switch_time.align", "left" }, { "game.panel.timegate_switch_time.valign", "top" }, - { "game.panel.timegate_switch_time.chars", "-1" }, + { "game.panel.timegate_switch_time.digits", "-1" }, { "game.panel.timegate_switch_time.font", "font.text_2" }, { "game.panel.switchgate_switch.x", "-1" }, { "game.panel.switchgate_switch.y", "-1" }, + { "game.panel.switchgate_switch.tile_size", "16" }, { "game.panel.emc_lenses.x", "-1" }, { "game.panel.emc_lenses.y", "-1" }, + { "game.panel.emc_lenses.tile_size", "16" }, { "game.panel.emc_lenses_time.x", "-1" }, { "game.panel.emc_lenses_time.y", "-1" }, { "game.panel.emc_lenses_time.align", "left" }, { "game.panel.emc_lenses_time.valign", "top" }, - { "game.panel.emc_lenses_time.chars", "-1" }, + { "game.panel.emc_lenses_time.digits", "-1" }, { "game.panel.emc_lenses_time.font", "font.text_2" }, { "game.panel.emc_magnifier.x", "-1" }, { "game.panel.emc_magnifier.y", "-1" }, + { "game.panel.emc_magnifier.tile_size", "16" }, { "game.panel.emc_magnifier_time.x", "-1" }, { "game.panel.emc_magnifier_time.y", "-1" }, { "game.panel.emc_magnifier_time.align", "left" }, { "game.panel.emc_magnifier_time.valign", "top" }, - { "game.panel.emc_magnifier_time.chars", "-1" }, + { "game.panel.emc_magnifier_time.digits", "-1" }, { "game.panel.emc_magnifier_time.font", "font.text_2" }, { "game.panel.balloon_switch.x", "-1" }, { "game.panel.balloon_switch.y", "-1" }, + { "game.panel.balloon_switch.tile_size", "16" }, { "game.panel.dynabomb_number.x", "-1" }, { "game.panel.dynabomb_number.y", "-1" }, { "game.panel.dynabomb_number.align", "left" }, { "game.panel.dynabomb_number.valign", "top" }, - { "game.panel.dynabomb_number.chars", "-1" }, + { "game.panel.dynabomb_number.digits", "-1" }, { "game.panel.dynabomb_number.font", "font.text_2" }, { "game.panel.dynabomb_size.x", "-1" }, { "game.panel.dynabomb_size.y", "-1" }, { "game.panel.dynabomb_size.align", "left" }, { "game.panel.dynabomb_size.valign", "top" }, - { "game.panel.dynabomb_size.chars", "-1" }, + { "game.panel.dynabomb_size.digits", "-1" }, { "game.panel.dynabomb_size.font", "font.text_2" }, { "game.panel.dynabomb_power.x", "-1" }, { "game.panel.dynabomb_power.y", "-1" }, + { "game.panel.dynabomb_power.tile_size", "16" }, { "game.panel.penguins.x", "-1" }, { "game.panel.penguins.y", "-1" }, { "game.panel.penguins.align", "left" }, { "game.panel.penguins.valign", "top" }, - { "game.panel.penguins.chars", "-1" }, + { "game.panel.penguins.digits", "-1" }, { "game.panel.penguins.font", "font.text_2" }, { "game.panel.sokoban_objects.x", "-1" }, { "game.panel.sokoban_objects.y", "-1" }, { "game.panel.sokoban_objects.align", "left" }, { "game.panel.sokoban_objects.valign", "top" }, - { "game.panel.sokoban_objects.chars", "-1" }, + { "game.panel.sokoban_objects.digits", "-1" }, { "game.panel.sokoban_objects.font", "font.text_2" }, { "game.panel.sokoban_fields.x", "-1" }, { "game.panel.sokoban_fields.y", "-1" }, { "game.panel.sokoban_fields.align", "left" }, { "game.panel.sokoban_fields.valign", "top" }, - { "game.panel.sokoban_fields.chars", "-1" }, + { "game.panel.sokoban_fields.digits", "-1" }, { "game.panel.sokoban_fields.font", "font.text_2" }, { "game.panel.robot_wheel.x", "-1" }, { "game.panel.robot_wheel.y", "-1" }, + { "game.panel.robot_wheel.tile_size", "16" }, { "game.panel.conveyor_belt_1.x", "-1" }, { "game.panel.conveyor_belt_1.y", "-1" }, + { "game.panel.conveyor_belt_1.tile_size", "16" }, { "game.panel.conveyor_belt_1_switch.x", "-1" }, { "game.panel.conveyor_belt_1_switch.y", "-1" }, + { "game.panel.conveyor_belt_1_switch.tile_size", "16" }, { "game.panel.conveyor_belt_2.x", "-1" }, { "game.panel.conveyor_belt_2.y", "-1" }, + { "game.panel.conveyor_belt_2.tile_size", "16" }, { "game.panel.conveyor_belt_2_switch.x", "-1" }, { "game.panel.conveyor_belt_2_switch.y", "-1" }, + { "game.panel.conveyor_belt_2_switch.tile_size", "16" }, { "game.panel.conveyor_belt_3.x", "-1" }, { "game.panel.conveyor_belt_3.y", "-1" }, + { "game.panel.conveyor_belt_3.tile_size", "16" }, { "game.panel.conveyor_belt_3_switch.x", "-1" }, { "game.panel.conveyor_belt_3_switch.y", "-1" }, + { "game.panel.conveyor_belt_3_switch.tile_size", "16" }, { "game.panel.conveyor_belt_4.x", "-1" }, { "game.panel.conveyor_belt_4.y", "-1" }, + { "game.panel.conveyor_belt_4.tile_size", "16" }, { "game.panel.conveyor_belt_4_switch.x", "-1" }, { "game.panel.conveyor_belt_4_switch.y", "-1" }, + { "game.panel.conveyor_belt_4_switch.tile_size", "16" }, { "game.panel.magic_wall.x", "-1" }, { "game.panel.magic_wall.y", "-1" }, + { "game.panel.magic_wall.tile_size", "16" }, { "game.panel.magic_wall_time.x", "-1" }, { "game.panel.magic_wall_time.y", "-1" }, { "game.panel.magic_wall_time.align", "left" }, { "game.panel.magic_wall_time.valign", "top" }, - { "game.panel.magic_wall_time.chars", "-1" }, + { "game.panel.magic_wall_time.digits", "-1" }, { "game.panel.magic_wall_time.font", "font.text_2" }, - { "game.panel.bd_magic_wall.x", "-1" }, - { "game.panel.bd_magic_wall.y", "-1" }, - { "game.panel.dc_magic_wall.x", "-1" }, - { "game.panel.dc_magic_wall.y", "-1" }, + + { "game.panel.gravity_state.x", "-1" }, + { "game.panel.gravity_state.y", "-1" }, + { "game.panel.gravity_state.align", "left" }, + { "game.panel.gravity_state.valign", "top" }, + { "game.panel.gravity_state.chars", "-1" }, + { "game.panel.gravity_state.font", "font.text_1" }, + { "game.panel.gravity_state.font_active", "font.text_2" }, { "game.panel.player_name.x", "-1" }, { "game.panel.player_name.y", "-1" },