X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=c7469e7e174838b4e0dfa007890f66f4a6acaecb;hb=585994e9f3f77300b730f790062010518f35a739;hp=c98d0601dc469b28f95f0106ca2c09b36848fdc8;hpb=dbe6f9f331452b40183a12219d57eb234ff078fe;p=rocksndiamonds.git diff --git a/src/conf_gfx.c b/src/conf_gfx.c index c98d0601..c7469e7e 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -60,6 +60,7 @@ struct ConfigTypeInfo image_config_suffix[] = { ".name", ARG_UNDEFINED, TYPE_STRING }, { ".scale_up_factor", ARG_UNDEFINED, TYPE_INTEGER }, { ".clone_from", ARG_UNDEFINED, TYPE_TOKEN }, + { ".fade_mode", ARG_UNDEFINED, TYPE_INTEGER }, { ".fade_delay", ARG_UNDEFINED, TYPE_INTEGER }, { ".post_delay", ARG_UNDEFINED, TYPE_INTEGER }, { ".auto_delay", ARG_UNDEFINED, TYPE_INTEGER }, @@ -4980,6 +4981,15 @@ struct ConfigInfo image_config[] = /* keyword to start parser: "CONFIG_VARS_START" <-- do not change! */ + { "[title_initial].fade_mode", "fade" }, + { "[title_initial].fade_delay", "500" }, + { "[title_initial].post_delay", "250" }, + { "[title_initial].auto_delay", "-1" }, + { "[title].fade_mode", "fade" }, + { "[title].fade_delay", "500" }, + { "[title].post_delay", "250" }, + { "[title].auto_delay", "-1" }, + { "[titlemessage_initial].x", "336" }, { "[titlemessage_initial].y", "280" }, { "[titlemessage_initial].width", "640" }, @@ -4993,6 +5003,10 @@ struct ConfigInfo image_config[] = { "[titlemessage_initial].centered", "false" }, { "[titlemessage_initial].parse_comments", "false" }, { "[titlemessage_initial].sort_priority", "0" }, + { "[titlemessage_initial].fade_mode", ARG_DEFAULT }, + { "[titlemessage_initial].fade_delay", ARG_DEFAULT }, + { "[titlemessage_initial].post_delay", ARG_DEFAULT }, + { "[titlemessage_initial].auto_delay", ARG_DEFAULT }, { "[titlemessage].x", "336" }, { "[titlemessage].y", "280" }, { "[titlemessage].width", "640" }, @@ -5006,6 +5020,10 @@ struct ConfigInfo image_config[] = { "[titlemessage].centered", "false" }, { "[titlemessage].parse_comments", "false" }, { "[titlemessage].sort_priority", "0" }, + { "[titlemessage].fade_mode", ARG_DEFAULT }, + { "[titlemessage].fade_delay", ARG_DEFAULT }, + { "[titlemessage].post_delay", ARG_DEFAULT }, + { "[titlemessage].auto_delay", ARG_DEFAULT }, { "titlemessage_initial_1.x", ARG_DEFAULT }, { "titlemessage_initial_1.y", ARG_DEFAULT }, @@ -5020,6 +5038,10 @@ struct ConfigInfo image_config[] = { "titlemessage_initial_1.centered", ARG_DEFAULT }, { "titlemessage_initial_1.parse_comments", ARG_DEFAULT }, { "titlemessage_initial_1.sort_priority", ARG_DEFAULT }, + { "titlemessage_initial_1.fade_mode", ARG_DEFAULT }, + { "titlemessage_initial_1.fade_delay", ARG_DEFAULT }, + { "titlemessage_initial_1.post_delay", ARG_DEFAULT }, + { "titlemessage_initial_1.auto_delay", ARG_DEFAULT }, { "titlemessage_initial_2.x", ARG_DEFAULT }, { "titlemessage_initial_2.y", ARG_DEFAULT }, { "titlemessage_initial_2.width", ARG_DEFAULT }, @@ -5033,6 +5055,10 @@ struct ConfigInfo image_config[] = { "titlemessage_initial_2.centered", ARG_DEFAULT }, { "titlemessage_initial_2.parse_comments", ARG_DEFAULT }, { "titlemessage_initial_2.sort_priority", ARG_DEFAULT }, + { "titlemessage_initial_2.fade_mode", ARG_DEFAULT }, + { "titlemessage_initial_2.fade_delay", ARG_DEFAULT }, + { "titlemessage_initial_2.post_delay", ARG_DEFAULT }, + { "titlemessage_initial_2.auto_delay", ARG_DEFAULT }, { "titlemessage_initial_3.x", ARG_DEFAULT }, { "titlemessage_initial_3.y", ARG_DEFAULT }, { "titlemessage_initial_3.width", ARG_DEFAULT }, @@ -5046,6 +5072,10 @@ struct ConfigInfo image_config[] = { "titlemessage_initial_3.centered", ARG_DEFAULT }, { "titlemessage_initial_3.parse_comments", ARG_DEFAULT }, { "titlemessage_initial_3.sort_priority", ARG_DEFAULT }, + { "titlemessage_initial_3.fade_mode", ARG_DEFAULT }, + { "titlemessage_initial_3.fade_delay", ARG_DEFAULT }, + { "titlemessage_initial_3.post_delay", ARG_DEFAULT }, + { "titlemessage_initial_3.auto_delay", ARG_DEFAULT }, { "titlemessage_initial_4.x", ARG_DEFAULT }, { "titlemessage_initial_4.y", ARG_DEFAULT }, { "titlemessage_initial_4.width", ARG_DEFAULT }, @@ -5059,6 +5089,10 @@ struct ConfigInfo image_config[] = { "titlemessage_initial_4.centered", ARG_DEFAULT }, { "titlemessage_initial_4.parse_comments", ARG_DEFAULT }, { "titlemessage_initial_4.sort_priority", ARG_DEFAULT }, + { "titlemessage_initial_4.fade_mode", ARG_DEFAULT }, + { "titlemessage_initial_4.fade_delay", ARG_DEFAULT }, + { "titlemessage_initial_4.post_delay", ARG_DEFAULT }, + { "titlemessage_initial_4.auto_delay", ARG_DEFAULT }, { "titlemessage_initial_5.x", ARG_DEFAULT }, { "titlemessage_initial_5.y", ARG_DEFAULT }, { "titlemessage_initial_5.width", ARG_DEFAULT }, @@ -5072,6 +5106,10 @@ struct ConfigInfo image_config[] = { "titlemessage_initial_5.centered", ARG_DEFAULT }, { "titlemessage_initial_5.parse_comments", ARG_DEFAULT }, { "titlemessage_initial_5.sort_priority", ARG_DEFAULT }, + { "titlemessage_initial_5.fade_mode", ARG_DEFAULT }, + { "titlemessage_initial_5.fade_delay", ARG_DEFAULT }, + { "titlemessage_initial_5.post_delay", ARG_DEFAULT }, + { "titlemessage_initial_5.auto_delay", ARG_DEFAULT }, { "titlemessage_1.x", ARG_DEFAULT }, { "titlemessage_1.y", ARG_DEFAULT }, { "titlemessage_1.width", ARG_DEFAULT }, @@ -5085,6 +5123,10 @@ struct ConfigInfo image_config[] = { "titlemessage_1.centered", ARG_DEFAULT }, { "titlemessage_1.parse_comments", ARG_DEFAULT }, { "titlemessage_1.sort_priority", ARG_DEFAULT }, + { "titlemessage_1.fade_mode", ARG_DEFAULT }, + { "titlemessage_1.fade_delay", ARG_DEFAULT }, + { "titlemessage_1.post_delay", ARG_DEFAULT }, + { "titlemessage_1.auto_delay", ARG_DEFAULT }, { "titlemessage_2.x", ARG_DEFAULT }, { "titlemessage_2.y", ARG_DEFAULT }, { "titlemessage_2.width", ARG_DEFAULT }, @@ -5098,6 +5140,10 @@ struct ConfigInfo image_config[] = { "titlemessage_2.centered", ARG_DEFAULT }, { "titlemessage_2.parse_comments", ARG_DEFAULT }, { "titlemessage_2.sort_priority", ARG_DEFAULT }, + { "titlemessage_2.fade_mode", ARG_DEFAULT }, + { "titlemessage_2.fade_delay", ARG_DEFAULT }, + { "titlemessage_2.post_delay", ARG_DEFAULT }, + { "titlemessage_2.auto_delay", ARG_DEFAULT }, { "titlemessage_3.x", ARG_DEFAULT }, { "titlemessage_3.y", ARG_DEFAULT }, { "titlemessage_3.width", ARG_DEFAULT }, @@ -5111,6 +5157,10 @@ struct ConfigInfo image_config[] = { "titlemessage_3.centered", ARG_DEFAULT }, { "titlemessage_3.parse_comments", ARG_DEFAULT }, { "titlemessage_3.sort_priority", ARG_DEFAULT }, + { "titlemessage_3.fade_mode", ARG_DEFAULT }, + { "titlemessage_3.fade_delay", ARG_DEFAULT }, + { "titlemessage_3.post_delay", ARG_DEFAULT }, + { "titlemessage_3.auto_delay", ARG_DEFAULT }, { "titlemessage_4.x", ARG_DEFAULT }, { "titlemessage_4.y", ARG_DEFAULT }, { "titlemessage_4.width", ARG_DEFAULT }, @@ -5124,6 +5174,10 @@ struct ConfigInfo image_config[] = { "titlemessage_4.centered", ARG_DEFAULT }, { "titlemessage_4.parse_comments", ARG_DEFAULT }, { "titlemessage_4.sort_priority", ARG_DEFAULT }, + { "titlemessage_4.fade_mode", ARG_DEFAULT }, + { "titlemessage_4.fade_delay", ARG_DEFAULT }, + { "titlemessage_4.post_delay", ARG_DEFAULT }, + { "titlemessage_4.auto_delay", ARG_DEFAULT }, { "titlemessage_5.x", ARG_DEFAULT }, { "titlemessage_5.y", ARG_DEFAULT }, { "titlemessage_5.width", ARG_DEFAULT }, @@ -5137,6 +5191,10 @@ struct ConfigInfo image_config[] = { "titlemessage_5.centered", ARG_DEFAULT }, { "titlemessage_5.parse_comments", ARG_DEFAULT }, { "titlemessage_5.sort_priority", ARG_DEFAULT }, + { "titlemessage_5.fade_mode", ARG_DEFAULT }, + { "titlemessage_5.fade_delay", ARG_DEFAULT }, + { "titlemessage_5.post_delay", ARG_DEFAULT }, + { "titlemessage_5.auto_delay", ARG_DEFAULT }, { "readme.x", "272" }, { "readme.y", "150" }, @@ -5164,13 +5222,42 @@ struct ConfigInfo image_config[] = { "border.draw_masked.PLAYING", "false" }, { "border.draw_masked.DOOR", "false" }, - { "title.fade_delay", "500" }, - { "title.post_delay", "250" }, - { "title.auto_delay", "-1" }, - - { "menu.fade_delay", "250" }, - { "menu.post_delay", "125" }, - { "menu.auto_delay", "-1" }, + { "menu.enter_menu.fade_mode", "none" }, + { "menu.enter_menu.fade_delay", "250" }, + { "menu.enter_menu.post_delay", "125" }, + { "menu.leave_menu.fade_mode", "none" }, + { "menu.leave_menu.fade_delay", "250" }, + { "menu.leave_menu.post_delay", "125" }, + { "menu.enter_screen.fade_mode", "fade" }, + { "menu.enter_screen.fade_delay", "250" }, + { "menu.enter_screen.post_delay", "125" }, + { "menu.leave_screen.fade_mode", "fade" }, + { "menu.leave_screen.fade_delay", "250" }, + { "menu.leave_screen.post_delay", "125" }, + { "menu.enter_screen.SCORES.fade_mode", ARG_DEFAULT }, + { "menu.enter_screen.SCORES.fade_delay", ARG_DEFAULT }, + { "menu.enter_screen.SCORES.post_delay", ARG_DEFAULT }, + { "menu.enter_screen.EDITOR.fade_mode", ARG_DEFAULT }, + { "menu.enter_screen.EDITOR.fade_delay", ARG_DEFAULT }, + { "menu.enter_screen.EDITOR.post_delay", ARG_DEFAULT }, + { "menu.enter_screen.INFO.fade_mode", ARG_DEFAULT }, + { "menu.enter_screen.INFO.fade_delay", ARG_DEFAULT }, + { "menu.enter_screen.INFO.post_delay", ARG_DEFAULT }, + { "menu.enter_screen.PLAYING.fade_mode", ARG_DEFAULT }, + { "menu.enter_screen.PLAYING.fade_delay", ARG_DEFAULT }, + { "menu.enter_screen.PLAYING.post_delay", ARG_DEFAULT }, + { "menu.leave_screen.SCORES.fade_mode", ARG_DEFAULT }, + { "menu.leave_screen.SCORES.fade_delay", ARG_DEFAULT }, + { "menu.leave_screen.SCORES.post_delay", ARG_DEFAULT }, + { "menu.leave_screen.EDITOR.fade_mode", ARG_DEFAULT }, + { "menu.leave_screen.EDITOR.fade_delay", ARG_DEFAULT }, + { "menu.leave_screen.EDITOR.post_delay", ARG_DEFAULT }, + { "menu.leave_screen.INFO.fade_mode", ARG_DEFAULT }, + { "menu.leave_screen.INFO.fade_delay", ARG_DEFAULT }, + { "menu.leave_screen.INFO.post_delay", ARG_DEFAULT }, + { "menu.leave_screen.PLAYING.fade_mode", ARG_DEFAULT }, + { "menu.leave_screen.PLAYING.fade_delay", ARG_DEFAULT }, + { "menu.leave_screen.PLAYING.post_delay", ARG_DEFAULT }, { "menu.draw_xoffset", "0" }, { "menu.draw_yoffset", "0" }, @@ -5407,7 +5494,7 @@ struct ConfigInfo image_config[] = { "game.panel.gems.x", "50" }, { "game.panel.gems.y", "54" }, { "game.panel.gems.align", "center" }, - { "game.panel.gems.valign", "top" }, + { "game.panel.gems.valign", "top" }, { "game.panel.gems.chars", "3" }, { "game.panel.gems.font", "font.text_2" }, @@ -5526,12 +5613,6 @@ struct ConfigInfo image_config[] = { "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" }, - { "game.panel.emc_magic_ball_time.valign", "top" }, - { "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" }, @@ -5676,6 +5757,8 @@ struct ConfigInfo image_config[] = { "game.button.sound_simple.x", "65" }, { "game.button.sound_simple.y", "245" }, + { "game.forced_scroll_delay_value", "-1" }, + { "[player].boring_delay_fixed", "1000" }, { "[player].boring_delay_random", "1000" }, { "[player].sleeping_delay_fixed", "2000" },