X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=f75a4671211f1da55c4179a6a4f93aad62159200;hb=74ed6f367314f4b4f373b45f82cedd04595a2608;hp=20a24667b4a92e121ea83719e761d159843bef07;hpb=6e9374af7b69e20dbab5b8b3e06a8d4e2ffb1ddd;p=rocksndiamonds.git diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 20a24667..f75a4671 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -4666,6 +4666,8 @@ struct ConfigInfo image_config[] = { "font.text_1.y", "140" }, { "font.text_1.width", "14" }, { "font.text_1.height", "14" }, + { "font.text_1.MAIN", UNDEFINED_FILENAME }, + { "font.text_1.MAIN.clone_from", "font.text_1.PREVIEW" }, { "font.text_1.LEVELS", "RocksFontMedium.pcx" }, { "font.text_1.LEVELS.x", "0" }, { "font.text_1.LEVELS.y", "0" }, @@ -4695,6 +4697,8 @@ struct ConfigInfo image_config[] = { "font.text_2.y", "210" }, { "font.text_2.width", "14" }, { "font.text_2.height", "14" }, + { "font.text_2.MAIN", UNDEFINED_FILENAME }, + { "font.text_2.MAIN.clone_from", "font.text_2.PREVIEW" }, { "font.text_2.LEVELS", "RocksFontMedium.pcx" }, { "font.text_2.LEVELS.x", "0" }, { "font.text_2.LEVELS.y", "160" }, @@ -4745,6 +4749,8 @@ struct ConfigInfo image_config[] = { "font.text_4.y", "70" }, { "font.text_4.width", "14" }, { "font.text_4.height", "14" }, + { "font.text_4.MAIN", UNDEFINED_FILENAME }, + { "font.text_4.MAIN.clone_from", "font.text_3.PREVIEW" }, { "font.text_4.LEVELS", "RocksFontMedium.pcx" }, { "font.text_4.LEVELS.x", "0" }, { "font.text_4.LEVELS.y", "480" }, @@ -4950,6 +4956,8 @@ struct ConfigInfo image_config[] = /* the following directives are not associated with an image, but probably make sense to be defined in "graphicsinfo.conf", too */ + /* keyword to start parser: "CONFIG_VARS_START" <-- do not change! */ + { "titlemessage_initial_1.x", "-1" }, { "titlemessage_initial_1.y", "-1" }, { "titlemessage_initial_1.width", "-1" }, @@ -5209,10 +5217,6 @@ struct ConfigInfo image_config[] = { "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" }, @@ -5221,6 +5225,10 @@ struct ConfigInfo image_config[] = { "main.text.last_level.y", "112" }, { "main.text.last_level.align", "left" }, { "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.font", "font.value_1" }, { "main.text.level_info_1.x", "272" }, { "main.text.level_info_1.y", "352" }, { "main.text.level_info_1.align", "center" }, @@ -5231,7 +5239,7 @@ struct ConfigInfo image_config[] = { "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_info_2.font_header", "font.text_4" }, { "main.text.level_name.x", "-1" }, { "main.text.level_name.y", "-1" }, { "main.text.level_name.align", "left" }, @@ -5304,30 +5312,55 @@ struct ConfigInfo image_config[] = { "door_2.step_delay", "10" }, { "door_2.anim_mode", "default" }, - { "game.panel.level.x", "51" }, - { "game.panel.level.y", "20" }, - { "game.panel.level.align", "center" }, - { "game.panel.level.chars", "-1" }, - { "game.panel.level.font", "font.text_2" }, - { "game.panel.level.font_narrow", "font.text_1" }, + { "game.panel.level_number.x", "51" }, + { "game.panel.level_number.y", "20" }, + { "game.panel.level_number.align", "center" }, + { "game.panel.level_number.chars", "-1" }, + { "game.panel.level_number.font", "font.text_2" }, + { "game.panel.level_number.font_narrow", "font.text_1" }, + { "game.panel.gems.x", "50" }, { "game.panel.gems.y", "54" }, { "game.panel.gems.align", "center" }, { "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.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.key_1.x", "18" }, + { "game.panel.key_1.y", "123" }, + { "game.panel.key_2.x", "34" }, + { "game.panel.key_2.y", "123" }, + { "game.panel.key_3.x", "50" }, + { "game.panel.key_3.y", "123" }, + { "game.panel.key_4.x", "66" }, + { "game.panel.key_4.y", "123" }, + { "game.panel.key_5.x", "-1" }, + { "game.panel.key_5.y", "-1" }, + { "game.panel.key_6.x", "-1" }, + { "game.panel.key_6.y", "-1" }, + { "game.panel.key_7.x", "-1" }, + { "game.panel.key_7.y", "-1" }, + { "game.panel.key_8.x", "-1" }, + { "game.panel.key_8.y", "-1" }, + { "game.panel.key_white.x", "-1" }, + { "game.panel.key_white.y", "-1" }, + { "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.chars", "-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.chars", "5" }, { "game.panel.score.font", "font.text_2" }, + { "game.panel.time.x", "50" }, { "game.panel.time.y", "194" }, { "game.panel.time.align", "center" }, @@ -5335,9 +5368,6 @@ struct ConfigInfo image_config[] = { "game.panel.time.font", "font.text_2" }, { "game.panel.time.font_narrow", "font.text_1" }, -#if 0 - /* --- not yet available (start) --- */ - { "game.panel.time_hh.x", "-1" }, { "game.panel.time_hh.y", "-1" }, { "game.panel.time_hh.align", "left" }, @@ -5370,29 +5400,6 @@ struct ConfigInfo image_config[] = { "game.panel.drop_next_7.y", "-1" }, { "game.panel.drop_next_8.x", "-1" }, { "game.panel.drop_next_8.y", "-1" }, - { "game.panel.key_1.x", "-1" }, - { "game.panel.key_1.y", "-1" }, - { "game.panel.key_2.x", "-1" }, - { "game.panel.key_2.y", "-1" }, - { "game.panel.key_3.x", "-1" }, - { "game.panel.key_3.y", "-1" }, - { "game.panel.key_4.x", "-1" }, - { "game.panel.key_4.y", "-1" }, - { "game.panel.key_5.x", "-1" }, - { "game.panel.key_5.y", "-1" }, - { "game.panel.key_6.x", "-1" }, - { "game.panel.key_6.y", "-1" }, - { "game.panel.key_7.x", "-1" }, - { "game.panel.key_7.y", "-1" }, - { "game.panel.key_8.x", "-1" }, - { "game.panel.key_8.y", "-1" }, - { "game.panel.key_white.x", "-1" }, - { "game.panel.key_white.y", "-1" }, - { "game.panel.white_keys.x", "-1" }, - { "game.panel.white_keys.y", "-1" }, - { "game.panel.white_keys.align", "left" }, - { "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" }, @@ -5422,6 +5429,8 @@ struct ConfigInfo image_config[] = { "game.panel.emc_magic_ball.x", "-1" }, { "game.panel.emc_magic_ball.y", "-1" }, + { "game.panel.emc_magic_ball_switch.x", "-1" }, + { "game.panel.emc_magic_ball_switch.y", "-1" }, { "game.panel.emc_magic_ball_time.x", "-1" }, { "game.panel.emc_magic_ball_time.y", "-1" }, { "game.panel.emc_magic_ball_time.align", "left" }, @@ -5501,18 +5510,18 @@ struct ConfigInfo image_config[] = { "game.panel.conveyor_belt_1.x", "-1" }, { "game.panel.conveyor_belt_1.y", "-1" }, - { "game.panel.conveyor_belt_2.x", "-1" }, - { "game.panel.conveyor_belt_2.y", "-1" }, - { "game.panel.conveyor_belt_3.x", "-1" }, - { "game.panel.conveyor_belt_3.y", "-1" }, - { "game.panel.conveyor_belt_4.x", "-1" }, - { "game.panel.conveyor_belt_4.y", "-1" }, { "game.panel.conveyor_belt_1_switch.x", "-1" }, { "game.panel.conveyor_belt_1_switch.y", "-1" }, + { "game.panel.conveyor_belt_2.x", "-1" }, + { "game.panel.conveyor_belt_2.y", "-1" }, { "game.panel.conveyor_belt_2_switch.x", "-1" }, { "game.panel.conveyor_belt_2_switch.y", "-1" }, + { "game.panel.conveyor_belt_3.x", "-1" }, + { "game.panel.conveyor_belt_3.y", "-1" }, { "game.panel.conveyor_belt_3_switch.x", "-1" }, { "game.panel.conveyor_belt_3_switch.y", "-1" }, + { "game.panel.conveyor_belt_4.x", "-1" }, + { "game.panel.conveyor_belt_4.y", "-1" }, { "game.panel.conveyor_belt_4_switch.x", "-1" }, { "game.panel.conveyor_belt_4_switch.y", "-1" }, @@ -5545,26 +5554,18 @@ struct ConfigInfo image_config[] = { "game.panel.level_author.chars", "-1" }, { "game.panel.level_author.font", "font.text_2" }, - { "game.panel.stop.x", "-1" }, - { "game.panel.stop.y", "-1" }, - - { "game.panel.pause.x", "-1" }, - { "game.panel.pause.y", "-1" }, - - { "game.panel.play.x", "-1" }, - { "game.panel.play.y", "-1" }, - - { "game.panel.sound_music.x", "-1" }, - { "game.panel.sound_music.y", "-1" }, - - { "game.panel.sound_loops.x", "-1" }, - { "game.panel.sound_loops.y", "-1" }, - - { "game.panel.sound_simple.x", "-1" }, - { "game.panel.sound_simple.y", "-1" }, - - /* --- not yet available (end) --- */ -#endif + { "game.button.stop.x", "5" }, + { "game.button.stop.y", "215" }, + { "game.button.pause.x", "35" }, + { "game.button.pause.y", "215" }, + { "game.button.play.x", "65" }, + { "game.button.play.y", "215" }, + { "game.button.sound_music.x", "5" }, + { "game.button.sound_music.y", "245" }, + { "game.button.sound_loops.x", "35" }, + { "game.button.sound_loops.y", "245" }, + { "game.button.sound_simple.x", "65" }, + { "game.button.sound_simple.y", "245" }, { "[player].boring_delay_fixed", "1000" }, { "[player].boring_delay_random", "1000" },