X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=271ef2eb73b1453e1f76b477699bf68633f387bf;hb=041e5e848c15b4a07020a6d9fe392fcda53d72a8;hp=640cb4e0d6321b21b3f9ec5d7a786008cb9fdbd3;hpb=197edf38367a6f825e4a60441a11a3c55191e51b;p=rocksndiamonds.git diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 640cb4e0..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 }, @@ -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 */ @@ -4601,6 +4611,39 @@ struct ConfigInfo image_config[] = { "menu.button_prev_level.active", UNDEFINED_FILENAME }, { "menu.button_prev_level.active.clone_from", "menu.button_left.active" }, + { "menu.button_name", UNDEFINED_FILENAME }, + { "menu.button_name.clone_from", "menu.button" }, + { "menu.button_name.active", UNDEFINED_FILENAME }, + { "menu.button_name.active.clone_from", "menu.button.active" }, + { "menu.button_levels", UNDEFINED_FILENAME }, + { "menu.button_levels.clone_from", "menu.button_right" }, + { "menu.button_levels.active", UNDEFINED_FILENAME }, + { "menu.button_levels.active.clone_from", "menu.button_right.active" }, + { "menu.button_scores", UNDEFINED_FILENAME }, + { "menu.button_scores.clone_from", "menu.button" }, + { "menu.button_scores.active", UNDEFINED_FILENAME }, + { "menu.button_scores.active.clone_from", "menu.button.active" }, + { "menu.button_editor", UNDEFINED_FILENAME }, + { "menu.button_editor.clone_from", "menu.button" }, + { "menu.button_editor.active", UNDEFINED_FILENAME }, + { "menu.button_editor.active.clone_from", "menu.button.active" }, + { "menu.button_info", UNDEFINED_FILENAME }, + { "menu.button_info.clone_from", "menu.button_right" }, + { "menu.button_info.active", UNDEFINED_FILENAME }, + { "menu.button_info.active.clone_from", "menu.button_right.active" }, + { "menu.button_game", UNDEFINED_FILENAME }, + { "menu.button_game.clone_from", "menu.button" }, + { "menu.button_game.active", UNDEFINED_FILENAME }, + { "menu.button_game.active.clone_from", "menu.button.active" }, + { "menu.button_setup", UNDEFINED_FILENAME }, + { "menu.button_setup.clone_from", "menu.button_right" }, + { "menu.button_setup.active", UNDEFINED_FILENAME }, + { "menu.button_setup.active.clone_from", "menu.button_right.active" }, + { "menu.button_quit", UNDEFINED_FILENAME }, + { "menu.button_quit.clone_from", "menu.button" }, + { "menu.button_quit.active", UNDEFINED_FILENAME }, + { "menu.button_quit.active.clone_from", "menu.button.active" }, + { "menu.scrollbar", "RocksDC.pcx" }, { "menu.scrollbar.xpos", "8" }, { "menu.scrollbar.ypos", "10" }, @@ -4641,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" }, @@ -4675,6 +4720,8 @@ struct ConfigInfo image_config[] = { "font.text_1.LEVELS.y", "0" }, { "font.text_1.LEVELS.width", "16" }, { "font.text_1.LEVELS.height", "32" }, + { "font.text_1.SETUP", UNDEFINED_FILENAME }, + { "font.text_1.SETUP.clone_from", "font.text_1.LEVELS" }, { "font.text_1.PREVIEW", "RocksFontEM.pcx" }, { "font.text_1.PREVIEW.x", "0" }, { "font.text_1.PREVIEW.y", "160" }, @@ -4706,6 +4753,8 @@ struct ConfigInfo image_config[] = { "font.text_2.LEVELS.y", "160" }, { "font.text_2.LEVELS.width", "16" }, { "font.text_2.LEVELS.height", "32" }, + { "font.text_2.SETUP", UNDEFINED_FILENAME }, + { "font.text_2.SETUP.clone_from", "font.text_2.LEVELS" }, { "font.text_2.PREVIEW", "RocksFontEM.pcx" }, { "font.text_2.PREVIEW.x", "0" }, { "font.text_2.PREVIEW.y", "160" }, @@ -4731,6 +4780,8 @@ struct ConfigInfo image_config[] = { "font.text_3.LEVELS.y", "320" }, { "font.text_3.LEVELS.width", "16" }, { "font.text_3.LEVELS.height", "32" }, + { "font.text_3.SETUP", UNDEFINED_FILENAME }, + { "font.text_3.SETUP.clone_from", "font.text_3.LEVELS" }, { "font.text_3.PREVIEW", "RocksFontEM.pcx" }, { "font.text_3.PREVIEW.x", "0" }, { "font.text_3.PREVIEW.y", "160" }, @@ -4758,6 +4809,8 @@ struct ConfigInfo image_config[] = { "font.text_4.LEVELS.y", "480" }, { "font.text_4.LEVELS.width", "16" }, { "font.text_4.LEVELS.height", "32" }, + { "font.text_4.SETUP", UNDEFINED_FILENAME }, + { "font.text_4.SETUP.clone_from", "font.text_4.LEVELS" }, { "font.text_4.SCORES", "RocksFontMedium.pcx" }, { "font.text_4.SCORES.x", "0" }, { "font.text_4.SCORES.y", "480" }, @@ -4881,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" }, @@ -5222,6 +5284,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" }, @@ -5231,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" }, @@ -5285,6 +5357,26 @@ struct ConfigInfo image_config[] = { "menu.draw_yoffset.INFO[LEVELSET]", "0" }, { "menu.draw_xoffset.SETUP", "0" }, { "menu.draw_yoffset.SETUP", "0" }, + { "menu.draw_xoffset.SETUP[GAME]", "0" }, + { "menu.draw_yoffset.SETUP[GAME]", "0" }, + { "menu.draw_xoffset.SETUP[EDITOR]", "0" }, + { "menu.draw_yoffset.SETUP[EDITOR]", "0" }, + { "menu.draw_xoffset.SETUP[GRAPHICS]", "0" }, + { "menu.draw_yoffset.SETUP[GRAPHICS]", "0" }, + { "menu.draw_xoffset.SETUP[SOUND]", "0" }, + { "menu.draw_yoffset.SETUP[SOUND]", "0" }, + { "menu.draw_xoffset.SETUP[ARTWORK]", "0" }, + { "menu.draw_yoffset.SETUP[ARTWORK]", "0" }, + { "menu.draw_xoffset.SETUP[INPUT]", "0" }, + { "menu.draw_yoffset.SETUP[INPUT]", "0" }, + { "menu.draw_xoffset.SETUP[SHORTCUTS_1]", "0" }, + { "menu.draw_yoffset.SETUP[SHORTCUTS_1]", "0" }, + { "menu.draw_xoffset.SETUP[SHORTCUTS_2]", "0" }, + { "menu.draw_yoffset.SETUP[SHORTCUTS_2]", "0" }, + { "menu.draw_xoffset.SETUP[CHOOSE_ARTWORK]", "0" }, + { "menu.draw_yoffset.SETUP[CHOOSE_ARTWORK]", "0" }, + { "menu.draw_xoffset.SETUP[CHOOSE_OTHER]", "0" }, + { "menu.draw_yoffset.SETUP[CHOOSE_OTHER]", "0" }, { "menu.scrollbar_xoffset", "0" }, @@ -5292,6 +5384,7 @@ struct ConfigInfo image_config[] = { "menu.list_size.LEVELS", "-1" }, { "menu.list_size.SCORES", "-1" }, { "menu.list_size.INFO", "-1" }, + { "menu.list_size.SETUP", "-1" }, { "main.button.name.x", "0" }, { "main.button.name.y", "64" }, @@ -5659,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" }, @@ -5925,6 +6027,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" }, @@ -6207,6 +6342,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" },