X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fconf_gfx.c;h=20a24667b4a92e121ea83719e761d159843bef07;hp=7f9e89fb15c83c207ef11f1b11faa06c0855f488;hb=6e9374af7b69e20dbab5b8b3e06a8d4e2ffb1ddd;hpb=590e9a86daa2b0d3923673bfe02525766224808e diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 7f9e89fb..20a24667 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -4957,6 +4957,7 @@ struct ConfigInfo image_config[] = { "titlemessage_initial_1.chars", "-1" }, { "titlemessage_initial_1.lines", "-1" }, { "titlemessage_initial_1.align", "center" }, + { "titlemessage_initial_1.font", "font.text_1" }, { "titlemessage_initial_1.autowrap", "false" }, { "titlemessage_initial_1.centered", "false" }, { "titlemessage_initial_1.skip_comments", "false" }, @@ -4968,6 +4969,7 @@ struct ConfigInfo image_config[] = { "titlemessage_initial_2.chars", "-1" }, { "titlemessage_initial_2.lines", "-1" }, { "titlemessage_initial_2.align", "center" }, + { "titlemessage_initial_2.font", "font.text_1" }, { "titlemessage_initial_2.autowrap", "false" }, { "titlemessage_initial_2.centered", "false" }, { "titlemessage_initial_2.skip_comments", "false" }, @@ -4979,6 +4981,7 @@ struct ConfigInfo image_config[] = { "titlemessage_initial_3.chars", "-1" }, { "titlemessage_initial_3.lines", "-1" }, { "titlemessage_initial_3.align", "center" }, + { "titlemessage_initial_3.font", "font.text_1" }, { "titlemessage_initial_3.autowrap", "false" }, { "titlemessage_initial_3.centered", "false" }, { "titlemessage_initial_3.skip_comments", "false" }, @@ -4990,6 +4993,7 @@ struct ConfigInfo image_config[] = { "titlemessage_initial_4.chars", "-1" }, { "titlemessage_initial_4.lines", "-1" }, { "titlemessage_initial_4.align", "center" }, + { "titlemessage_initial_4.font", "font.text_1" }, { "titlemessage_initial_4.autowrap", "false" }, { "titlemessage_initial_4.centered", "false" }, { "titlemessage_initial_4.skip_comments", "false" }, @@ -5001,6 +5005,7 @@ struct ConfigInfo image_config[] = { "titlemessage_initial_5.chars", "-1" }, { "titlemessage_initial_5.lines", "-1" }, { "titlemessage_initial_5.align", "center" }, + { "titlemessage_initial_5.font", "font.text_1" }, { "titlemessage_initial_5.autowrap", "false" }, { "titlemessage_initial_5.centered", "false" }, { "titlemessage_initial_5.skip_comments", "false" }, @@ -5012,6 +5017,7 @@ struct ConfigInfo image_config[] = { "titlemessage_1.chars", "-1" }, { "titlemessage_1.lines", "-1" }, { "titlemessage_1.align", "center" }, + { "titlemessage_1.font", "font.text_1" }, { "titlemessage_1.autowrap", "false" }, { "titlemessage_1.centered", "false" }, { "titlemessage_1.skip_comments", "false" }, @@ -5023,6 +5029,7 @@ struct ConfigInfo image_config[] = { "titlemessage_2.chars", "-1" }, { "titlemessage_2.lines", "-1" }, { "titlemessage_2.align", "center" }, + { "titlemessage_2.font", "font.text_1" }, { "titlemessage_2.autowrap", "false" }, { "titlemessage_2.centered", "false" }, { "titlemessage_2.skip_comments", "false" }, @@ -5034,6 +5041,7 @@ struct ConfigInfo image_config[] = { "titlemessage_3.chars", "-1" }, { "titlemessage_3.lines", "-1" }, { "titlemessage_3.align", "center" }, + { "titlemessage_3.font", "font.text_1" }, { "titlemessage_3.autowrap", "false" }, { "titlemessage_3.centered", "false" }, { "titlemessage_3.skip_comments", "false" }, @@ -5045,6 +5053,7 @@ struct ConfigInfo image_config[] = { "titlemessage_4.chars", "-1" }, { "titlemessage_4.lines", "-1" }, { "titlemessage_4.align", "center" }, + { "titlemessage_4.font", "font.text_1" }, { "titlemessage_4.autowrap", "false" }, { "titlemessage_4.centered", "false" }, { "titlemessage_4.skip_comments", "false" }, @@ -5056,6 +5065,7 @@ struct ConfigInfo image_config[] = { "titlemessage_5.chars", "-1" }, { "titlemessage_5.lines", "-1" }, { "titlemessage_5.align", "center" }, + { "titlemessage_5.font", "font.text_1" }, { "titlemessage_5.autowrap", "false" }, { "titlemessage_5.centered", "false" }, { "titlemessage_5.skip_comments", "false" }, @@ -5068,6 +5078,7 @@ struct ConfigInfo image_config[] = { "readme.chars", "-1" }, { "readme.lines", "-1" }, { "readme.align", "center" }, + { "readme.font", "font.info.levelset" }, { "readme.autowrap", "true" }, { "readme.centered", "false" }, { "readme.skip_comments", "true" }, @@ -5154,96 +5165,120 @@ struct ConfigInfo image_config[] = { "main.text.name.width", "-1" }, { "main.text.name.height", "-1" }, { "main.text.name.align", "left" }, + { "main.text.name.font", "font.menu_1" }, { "main.text.levels.x", "-1" }, { "main.text.levels.y", "-1" }, { "main.text.levels.width", "-1" }, { "main.text.levels.height", "-1" }, { "main.text.levels.align", "left" }, + { "main.text.levels.font", "font.menu_1" }, { "main.text.scores.x", "-1" }, { "main.text.scores.y", "-1" }, { "main.text.scores.width", "-1" }, { "main.text.scores.height", "-1" }, { "main.text.scores.align", "left" }, + { "main.text.scores.font", "font.menu_1" }, { "main.text.editor.x", "-1" }, { "main.text.editor.y", "-1" }, { "main.text.editor.width", "-1" }, { "main.text.editor.height", "-1" }, { "main.text.editor.align", "left" }, + { "main.text.editor.font", "font.menu_1" }, { "main.text.info.x", "-1" }, { "main.text.info.y", "-1" }, { "main.text.info.width", "-1" }, { "main.text.info.height", "-1" }, { "main.text.info.align", "left" }, + { "main.text.info.font", "font.menu_1" }, { "main.text.game.x", "-1" }, { "main.text.game.y", "-1" }, { "main.text.game.width", "-1" }, { "main.text.game.height", "-1" }, { "main.text.game.align", "left" }, + { "main.text.game.font", "font.menu_1" }, { "main.text.setup.x", "-1" }, { "main.text.setup.y", "-1" }, { "main.text.setup.width", "-1" }, { "main.text.setup.height", "-1" }, { "main.text.setup.align", "left" }, + { "main.text.setup.font", "font.menu_1" }, { "main.text.quit.x", "-1" }, { "main.text.quit.y", "-1" }, { "main.text.quit.width", "-1" }, { "main.text.quit.height", "-1" }, { "main.text.quit.align", "left" }, + { "main.text.quit.font", "font.menu_1" }, { "main.text.current_level.x", "352" }, { "main.text.current_level.y", "96" }, { "main.text.current_level.align", "left" }, + { "main.text.current_level.font", "font.value_1" }, { "main.text.first_level.x", "488" }, { "main.text.first_level.y", "98" }, { "main.text.first_level.align", "left" }, + { "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.font", "font.text_3" }, { "main.text.level_info_1.x", "272" }, { "main.text.level_info_1.y", "352" }, { "main.text.level_info_1.align", "center" }, { "main.text.level_info_1.chars", "-1" }, + { "main.text.level_info_1.font", "font.text_1" }, { "main.text.level_info_2.x", "272" }, { "main.text.level_info_2.y", "523" }, { "main.text.level_info_2.align", "center" }, { "main.text.level_info_2.chars", "-1" }, + { "main.text.level_info_2.font", "font.text_2" }, + { "main.text.level_info_2.font_header", "font.text_3" }, { "main.text.level_name.x", "-1" }, { "main.text.level_name.y", "-1" }, { "main.text.level_name.align", "left" }, { "main.text.level_name.chars", "-1" }, + { "main.text.level_name.font", "font.text_2" }, { "main.text.level_author.x", "-1" }, { "main.text.level_author.y", "-1" }, { "main.text.level_author.align", "left" }, { "main.text.level_author.chars", "-1" }, + { "main.text.level_author.font", "font.text_2" }, { "main.text.level_year.x", "-1" }, { "main.text.level_year.y", "-1" }, { "main.text.level_year.align", "left" }, { "main.text.level_year.chars", "-1" }, + { "main.text.level_year.font", "font.text_2" }, { "main.text.level_imported_from.x", "-1" }, { "main.text.level_imported_from.y", "-1" }, { "main.text.level_imported_from.align", "left" }, { "main.text.level_imported_from.chars", "-1" }, + { "main.text.level_imported_from.font", "font.text_2" }, { "main.text.level_imported_by.x", "-1" }, { "main.text.level_imported_by.y", "-1" }, { "main.text.level_imported_by.align", "left" }, { "main.text.level_imported_by.chars", "-1" }, + { "main.text.level_imported_by.font", "font.text_2" }, { "main.text.level_tested_by.x", "-1" }, { "main.text.level_tested_by.y", "-1" }, { "main.text.level_tested_by.align", "left" }, { "main.text.level_tested_by.chars", "-1" }, + { "main.text.level_tested_by.font", "font.text_2" }, { "main.text.title_1.x", "272" }, { "main.text.title_1.y", "8" }, { "main.text.title_1.align", "center" }, + { "main.text.title_1.font", "font.title_1" }, { "main.text.title_2.x", "272" }, { "main.text.title_2.y", "46" }, { "main.text.title_2.align", "center" }, + { "main.text.title_2.font", "font.title_2" }, { "main.text.title_3.x", "272" }, { "main.text.title_3.y", "326" }, { "main.text.title_3.align", "center" }, + { "main.text.title_3.font", "font.title_2" }, { "main.input.name.x", "-1" }, { "main.input.name.y", "-1" }, { "main.input.name.align", "left" }, + { "main.input.name.font", "font.input_1" }, { "preview.x", "272" }, { "preview.y", "380" }, @@ -5272,26 +5307,33 @@ struct ConfigInfo image_config[] = { "game.panel.level.x", "51" }, { "game.panel.level.y", "20" }, { "game.panel.level.align", "center" }, - { "game.panel.level.digits", "-1" }, + { "game.panel.level.chars", "-1" }, + { "game.panel.level.font", "font.text_2" }, + { "game.panel.level.font_narrow", "font.text_1" }, { "game.panel.gems.x", "50" }, { "game.panel.gems.y", "54" }, { "game.panel.gems.align", "center" }, - { "game.panel.gems.digits", "3" }, + { "game.panel.gems.chars", "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.digits", "3" }, + { "game.panel.inventory.chars", "3" }, + { "game.panel.inventory.font", "font.text_2" }, { "game.panel.keys.x", "50" }, { "game.panel.keys.y", "123" }, { "game.panel.keys.align", "center" }, { "game.panel.score.x", "50" }, { "game.panel.score.y", "159" }, { "game.panel.score.align", "center" }, - { "game.panel.score.digits", "5" }, + { "game.panel.score.chars", "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.digits", "-1" }, + { "game.panel.time.chars", "-1" }, + { "game.panel.time.font", "font.text_2" }, + { "game.panel.time.font_narrow", "font.text_1" }, #if 0 /* --- not yet available (start) --- */ @@ -5299,15 +5341,18 @@ struct ConfigInfo image_config[] = { "game.panel.time_hh.x", "-1" }, { "game.panel.time_hh.y", "-1" }, { "game.panel.time_hh.align", "left" }, - { "game.panel.time_hh.digits", "-1" }, + { "game.panel.time_hh.chars", "-1" }, + { "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.digits", "-1" }, + { "game.panel.time_mm.chars", "-1" }, + { "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.digits", "-1" }, + { "game.panel.time_ss.chars", "-1" }, + { "game.panel.time_ss.font", "font.text_2" }, { "game.panel.drop_next_1.x", "-1" }, { "game.panel.drop_next_1.y", "-1" }, @@ -5346,20 +5391,23 @@ struct ConfigInfo image_config[] = { "game.panel.white_keys.x", "-1" }, { "game.panel.white_keys.y", "-1" }, { "game.panel.white_keys.align", "left" }, - { "game.panel.white_keys.digits", "-1" }, + { "game.panel.white_keys.chars", "-1" }, + { "game.panel.white_keys.font", "font.text_2" }, { "game.panel.shield_normal.x", "-1" }, { "game.panel.shield_normal.y", "-1" }, { "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.digits", "-1" }, + { "game.panel.shield_normal_time.chars", "-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_time.x", "-1" }, { "game.panel.shield_deadly_time.y", "-1" }, { "game.panel.shield_deadly_time.align", "left" }, - { "game.panel.shield_deadly_time.digits", "-1" }, + { "game.panel.shield_deadly_time.chars", "-1" }, + { "game.panel.shield_deadly_time.font", "font.text_2" }, { "game.panel.exit.x", "-1" }, { "game.panel.exit.y", "-1" }, @@ -5377,21 +5425,24 @@ struct ConfigInfo image_config[] = { "game.panel.emc_magic_ball_time.x", "-1" }, { "game.panel.emc_magic_ball_time.y", "-1" }, { "game.panel.emc_magic_ball_time.align", "left" }, - { "game.panel.emc_magic_ball_time.digits", "-1" }, + { "game.panel.emc_magic_ball_time.chars", "-1" }, + { "game.panel.emc_magic_ball_time.font", "font.text_2" }, { "game.panel.light_switch.x", "-1" }, { "game.panel.light_switch.y", "-1" }, { "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.digits", "-1" }, + { "game.panel.light_switch_time.chars", "-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_time.x", "-1" }, { "game.panel.timegate_switch_time.y", "-1" }, { "game.panel.timegate_switch_time.align", "left" }, - { "game.panel.timegate_switch_time.digits", "-1" }, + { "game.panel.timegate_switch_time.chars", "-1" }, + { "game.panel.timegate_switch_time.font", "font.text_2" }, { "game.panel.switchgate_switch.x", "-1" }, { "game.panel.switchgate_switch.y", "-1" }, @@ -5401,14 +5452,16 @@ struct ConfigInfo image_config[] = { "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.digits", "-1" }, + { "game.panel.emc_lenses_time.chars", "-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_time.x", "-1" }, { "game.panel.emc_magnifier_time.y", "-1" }, { "game.panel.emc_magnifier_time.align", "left" }, - { "game.panel.emc_magnifier_time.digits", "-1" }, + { "game.panel.emc_magnifier_time.chars", "-1" }, + { "game.panel.emc_magnifier_time.font", "font.text_2" }, { "game.panel.balloon_switch.x", "-1" }, { "game.panel.balloon_switch.y", "-1" }, @@ -5416,27 +5469,32 @@ struct ConfigInfo image_config[] = { "game.panel.dynabomb_number.x", "-1" }, { "game.panel.dynabomb_number.y", "-1" }, { "game.panel.dynabomb_number.align", "left" }, - { "game.panel.dynabomb_number.digits", "-1" }, + { "game.panel.dynabomb_number.chars", "-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.digits", "-1" }, + { "game.panel.dynabomb_size.chars", "-1" }, + { "game.panel.dynabomb_size.font", "font.text_2" }, { "game.panel.dynabomb_power.x", "-1" }, { "game.panel.dynabomb_power.y", "-1" }, { "game.panel.penguins.x", "-1" }, { "game.panel.penguins.y", "-1" }, { "game.panel.penguins.align", "left" }, - { "game.panel.penguins.digits", "-1" }, + { "game.panel.penguins.chars", "-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.digits", "-1" }, + { "game.panel.sokoban_objects.chars", "-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.digits", "-1" }, + { "game.panel.sokoban_fields.chars", "-1" }, + { "game.panel.sokoban_fields.font", "font.text_2" }, { "game.panel.robot_wheel.x", "-1" }, { "game.panel.robot_wheel.y", "-1" }, @@ -5463,7 +5521,8 @@ struct ConfigInfo image_config[] = { "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.digits", "-1" }, + { "game.panel.magic_wall_time.chars", "-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" }, @@ -5473,15 +5532,18 @@ struct ConfigInfo image_config[] = { "game.panel.player_name.y", "-1" }, { "game.panel.player_name.align", "left" }, { "game.panel.player_name.chars", "-1" }, + { "game.panel.player_name.font", "font.text_2" }, { "game.panel.level_name.x", "-1" }, { "game.panel.level_name.y", "-1" }, { "game.panel.level_name.align", "left" }, { "game.panel.level_name.chars", "-1" }, + { "game.panel.level_name.font", "font.text_2" }, { "game.panel.level_author.x", "-1" }, { "game.panel.level_author.y", "-1" }, { "game.panel.level_author.align", "left" }, { "game.panel.level_author.chars", "-1" }, + { "game.panel.level_author.font", "font.text_2" }, { "game.panel.stop.x", "-1" }, { "game.panel.stop.y", "-1" },