X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=271ef2eb73b1453e1f76b477699bf68633f387bf;hb=041e5e848c15b4a07020a6d9fe392fcda53d72a8;hp=0ea0ef868408cd73fe33bd34780db2a202fc8bd9;hpb=6d06ba238902736bb99714dc8122bb32a286577a;p=rocksndiamonds.git diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 0ea0ef86..271ef2eb 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -43,8 +43,8 @@ struct ConfigTypeInfo image_config_suffix[] = { ".delay", "1", TYPE_INTEGER }, { ".anim_mode", ARG_UNDEFINED, TYPE_STRING }, { ".global_sync", "false", TYPE_BOOLEAN }, - { ".crumbled_like", ARG_UNDEFINED, TYPE_TOKEN }, - { ".diggable_like", ARG_UNDEFINED, TYPE_TOKEN }, + { ".crumbled_like", ARG_UNDEFINED, TYPE_ELEMENT }, + { ".diggable_like", ARG_UNDEFINED, TYPE_ELEMENT }, { ".border_size", ARG_UNDEFINED, TYPE_INTEGER }, { ".step_offset", "4", TYPE_INTEGER }, { ".step_delay", "1", TYPE_INTEGER }, @@ -59,7 +59,7 @@ struct ConfigTypeInfo image_config_suffix[] = { ".post_delay_random", ARG_UNDEFINED, TYPE_INTEGER }, { ".name", ARG_UNDEFINED, TYPE_STRING }, { ".scale_up_factor", ARG_UNDEFINED, TYPE_INTEGER }, - { ".clone_from", ARG_UNDEFINED, TYPE_TOKEN }, + { ".clone_from", ARG_UNDEFINED, TYPE_GRAPHIC }, { ".fade_mode", ARG_UNDEFINED, TYPE_INTEGER }, { ".fade_delay", ARG_UNDEFINED, TYPE_INTEGER }, { ".post_delay", ARG_UNDEFINED, TYPE_INTEGER }, @@ -4684,6 +4684,8 @@ struct ConfigInfo image_config[] = { "font.title_2.y", "0" }, { "font.title_2.width", "14" }, { "font.title_2.height", "14" }, + { "font.title_2.SETUP", UNDEFINED_FILENAME }, + { "font.title_2.SETUP.clone_from", "font.text_4" }, { "font.menu_1", "RocksFontBig.pcx" }, { "font.menu_1.x", "0" }, @@ -4932,6 +4934,15 @@ struct ConfigInfo image_config[] = { "global.border", "RocksScreen.pcx" }, { "global.door", "RocksDoor.pcx" }, + { "global.busy", "RocksBusy.pcx" }, + { "global.busy.x", "0" }, + { "global.busy.y", "0" }, + { "global.busy.width", "32" }, + { "global.busy.height", "32" }, + { "global.busy.frames", "28" }, + { "global.busy.frames_per_line", "7" }, + { "global.busy.delay", "2" }, + { "editor.element_border", "RocksElements.pcx" }, { "editor.element_border.xpos", "0" }, { "editor.element_border.ypos", "0" }, @@ -5275,6 +5286,11 @@ struct ConfigInfo image_config[] = { "border.draw_masked_when_fading", "true" }, + { "init.busy.x", "336" }, + { "init.busy.y", "280" }, + { "init.busy.align", "center" }, + { "init.busy.valign", "middle" }, + { "menu.enter_menu.fade_mode", "none" }, { "menu.enter_menu.fade_delay", "250" }, { "menu.enter_menu.post_delay", "125" }, @@ -5284,6 +5300,9 @@ struct ConfigInfo image_config[] = { "menu.enter_screen.fade_mode", "fade" }, { "menu.enter_screen.fade_delay", "250" }, { "menu.enter_screen.post_delay", "125" }, + { "menu.next_screen.fade_mode", "crossfade" }, + { "menu.next_screen.fade_delay", "250" }, + { "menu.next_screen.post_delay", "125" }, { "menu.leave_screen.fade_mode", "fade" }, { "menu.leave_screen.fade_delay", "250" }, { "menu.leave_screen.post_delay", "125" }, @@ -5733,6 +5752,15 @@ struct ConfigInfo image_config[] = { "game.panel.score.draw_masked", "true" }, { "game.panel.score.draw_order", "0" }, + { "game.panel.highscore.x", "-1" }, + { "game.panel.highscore.y", "-1" }, + { "game.panel.highscore.align", "left" }, + { "game.panel.highscore.valign", "top" }, + { "game.panel.highscore.digits", "5" }, + { "game.panel.highscore.font", "font.text_2" }, + { "game.panel.highscore.draw_masked", "true" }, + { "game.panel.highscore.draw_order", "0" }, + { "game.panel.time.x", "50" }, { "game.panel.time.y", "194" }, { "game.panel.time.align", "center" }, @@ -6314,7 +6342,6 @@ struct ConfigInfo image_config[] = { "game.button.sound_simple.y", "245" }, { "game.forced_scroll_delay_value", "-1" }, - { "game.use_native_emc_graphics_engine", "false" }, { "[player].boring_delay_fixed", "1000" },