X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=4c7e7cb7cfcfdd46edade4706bcb458f9c39022a;hb=e63e92923fa0196ba7d538d4c8f5a16994e3bee8;hp=12ede026682fa996f3d90ca51f2cc83b05b477d5;hpb=013255ff68bf77db29470e26ac4cd7777836c8b0;p=rocksndiamonds.git diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 12ede026..4c7e7cb7 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 }, @@ -4319,6 +4319,16 @@ struct ConfigInfo image_config[] = { "emc_dripper.active.ypos", "8" }, { "emc_dripper.active.frames", "1" }, + /* (these are only defined as elements to support ".PANEL" definitions) */ + { "graphic_1", UNDEFINED_FILENAME }, + { "graphic_2", UNDEFINED_FILENAME }, + { "graphic_3", UNDEFINED_FILENAME }, + { "graphic_4", UNDEFINED_FILENAME }, + { "graphic_5", UNDEFINED_FILENAME }, + { "graphic_6", UNDEFINED_FILENAME }, + { "graphic_7", UNDEFINED_FILENAME }, + { "graphic_8", UNDEFINED_FILENAME }, + #include "conf_chr.c" /* include auto-generated data structure definitions */ #include "conf_cus.c" /* include auto-generated data structure definitions */ #include "conf_grp.c" /* include auto-generated data structure definitions */ @@ -4326,6 +4336,10 @@ struct ConfigInfo image_config[] = /* images not associated to game elements (used for menu screens etc.) */ /* keyword to stop parser: "NO_MORE_ELEMENT_IMAGES" <-- do not change! */ +#if 1 + { "sp_objects", "sp_objects.pcx" }, +#endif + #if 1 /* !!! TEMPORARILY STORED HERE -- PROBABLY TO BE CHANGED !!! */ @@ -4674,6 +4688,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" }, @@ -4922,13 +4938,22 @@ 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" }, + { "editor.element_border.x", "0" }, + { "editor.element_border.y", "0" }, - { "editor.element_border_input", "RocksElements.pcx" }, - { "editor.element_border_input.xpos", "0" }, - { "editor.element_border_input.ypos", "0" }, + { "editor.element_border_input", "RocksDoor.pcx" }, + { "editor.element_border_input.x", "740" }, + { "editor.element_border_input.y", "48" }, { "editor.cascade_list", "RocksDoor.pcx" }, { "editor.cascade_list.x", "708" }, @@ -4954,6 +4979,7 @@ struct ConfigInfo image_config[] = { "background.INFO[VERSION]", UNDEFINED_FILENAME }, { "background.INFO[LEVELSET]", UNDEFINED_FILENAME }, { "background.SETUP", UNDEFINED_FILENAME }, + { "background.PLAYING", UNDEFINED_FILENAME }, { "background.DOOR", UNDEFINED_FILENAME }, { "background.titlescreen_initial_1", UNDEFINED_FILENAME }, @@ -5263,6 +5289,13 @@ struct ConfigInfo image_config[] = { "border.draw_masked.PLAYING", "false" }, { "border.draw_masked.DOOR", "false" }, + { "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" }, @@ -5272,6 +5305,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" }, @@ -5721,6 +5757,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" }, @@ -5987,6 +6032,39 @@ struct ConfigInfo image_config[] = { "game.panel.gravity_state.draw_masked", "true" }, { "game.panel.gravity_state.draw_order", "0" }, + { "game.panel.graphic_1.x", "-1" }, + { "game.panel.graphic_1.y", "-1" }, + { "game.panel.graphic_1.draw_masked", "true" }, + { "game.panel.graphic_1.draw_order", "0" }, + { "game.panel.graphic_2.x", "-1" }, + { "game.panel.graphic_2.y", "-1" }, + { "game.panel.graphic_2.draw_masked", "true" }, + { "game.panel.graphic_2.draw_order", "0" }, + { "game.panel.graphic_3.x", "-1" }, + { "game.panel.graphic_3.y", "-1" }, + { "game.panel.graphic_3.draw_masked", "true" }, + { "game.panel.graphic_3.draw_order", "0" }, + { "game.panel.graphic_4.x", "-1" }, + { "game.panel.graphic_4.y", "-1" }, + { "game.panel.graphic_4.draw_masked", "true" }, + { "game.panel.graphic_4.draw_order", "0" }, + { "game.panel.graphic_5.x", "-1" }, + { "game.panel.graphic_5.y", "-1" }, + { "game.panel.graphic_5.draw_masked", "true" }, + { "game.panel.graphic_5.draw_order", "0" }, + { "game.panel.graphic_6.x", "-1" }, + { "game.panel.graphic_6.y", "-1" }, + { "game.panel.graphic_6.draw_masked", "true" }, + { "game.panel.graphic_6.draw_order", "0" }, + { "game.panel.graphic_7.x", "-1" }, + { "game.panel.graphic_7.y", "-1" }, + { "game.panel.graphic_7.draw_masked", "true" }, + { "game.panel.graphic_7.draw_order", "0" }, + { "game.panel.graphic_8.x", "-1" }, + { "game.panel.graphic_8.y", "-1" }, + { "game.panel.graphic_8.draw_masked", "true" }, + { "game.panel.graphic_8.draw_order", "0" }, + { "game.panel.element_1.x", "-1" }, { "game.panel.element_1.y", "-1" }, { "game.panel.element_1.tile_size", "16" }, @@ -6269,6 +6347,7 @@ 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" }, { "[player].boring_delay_random", "1000" },