X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=829000dab50915c3d9f05fddc85fbc0888d6f539;hb=3e57e03f559affcfaee4f975afab011cfd598d5c;hp=96d500c1fc1fe80ad203d112ed77b4d33254ac02;hpb=31293fa5f373168828272f461ce38ff70b0a3cb8;p=rocksndiamonds.git diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 96d500c1..829000da 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -41,6 +41,7 @@ struct ConfigTypeInfo image_config_suffix[] = { ".delay", "1", TYPE_INTEGER }, { ".anim_mode", ARG_UNDEFINED, TYPE_STRING }, { ".global_sync", "false", TYPE_BOOLEAN }, + { ".global_anim_sync", "false", TYPE_BOOLEAN }, { ".crumbled_like", ARG_UNDEFINED, TYPE_ELEMENT }, { ".diggable_like", ARG_UNDEFINED, TYPE_ELEMENT }, { ".border_size", ARG_UNDEFINED, TYPE_INTEGER }, @@ -200,8 +201,7 @@ struct ConfigInfo image_config[] = { "bd_amoeba.xpos", "8" }, { "bd_amoeba.ypos", "6" }, { "bd_amoeba.frames", "4" }, - { "bd_amoeba.delay", "1000000" }, - { "bd_amoeba.anim_mode", "random" }, + { "bd_amoeba.anim_mode", "random_static" }, { "bd_amoeba.EDITOR", "RocksElements.png" }, { "bd_amoeba.EDITOR.xpos", "8" }, { "bd_amoeba.EDITOR.ypos", "7" }, @@ -1495,8 +1495,7 @@ struct ConfigInfo image_config[] = { "amoeba_wet.xpos", "8" }, { "amoeba_wet.ypos", "6" }, { "amoeba_wet.frames", "4" }, - { "amoeba_wet.delay", "1000000" }, - { "amoeba_wet.anim_mode", "random" }, + { "amoeba_wet.anim_mode", "random_static" }, { "amoeba_wet.EDITOR", "RocksElements.png" }, { "amoeba_wet.EDITOR.xpos", "4" }, { "amoeba_wet.EDITOR.ypos", "6" }, @@ -1504,20 +1503,17 @@ struct ConfigInfo image_config[] = { "amoeba.dropping.xpos", "8" }, { "amoeba.dropping.ypos", "6" }, { "amoeba.dropping.frames", "4" }, - { "amoeba.dropping.delay", "1000000" }, - { "amoeba.dropping.anim_mode", "random" }, + { "amoeba.dropping.anim_mode", "random_static" }, { "amoeba_dry", "RocksElements.png" }, { "amoeba_dry.xpos", "8" }, { "amoeba_dry.ypos", "6" }, { "amoeba_dry.frames", "4" }, - { "amoeba_dry.delay", "1000000" }, - { "amoeba_dry.anim_mode", "random" }, + { "amoeba_dry.anim_mode", "random_static" }, { "amoeba_full", "RocksElements.png" }, { "amoeba_full.xpos", "8" }, { "amoeba_full.ypos", "6" }, { "amoeba_full.frames", "4" }, - { "amoeba_full.delay", "1000000" }, - { "amoeba_full.anim_mode", "random" }, + { "amoeba_full.anim_mode", "random_static" }, { "amoeba_full.EDITOR", "RocksElements.png" }, { "amoeba_full.EDITOR.xpos", "8" }, { "amoeba_full.EDITOR.ypos", "7" }, @@ -1525,8 +1521,7 @@ struct ConfigInfo image_config[] = { "amoeba_dead.xpos", "12" }, { "amoeba_dead.ypos", "6" }, { "amoeba_dead.frames", "4" }, - { "amoeba_dead.delay", "1000000" }, - { "amoeba_dead.anim_mode", "random" }, + { "amoeba_dead.anim_mode", "random_static" }, { "amoeba_dead.EDITOR", "RocksElements.png" }, { "amoeba_dead.EDITOR.xpos", "12" }, { "amoeba_dead.EDITOR.ypos", "6" }, @@ -5109,8 +5104,7 @@ struct ConfigInfo image_config[] = { "mm_lightball.xpos", "12" }, { "mm_lightball.ypos", "2" }, { "mm_lightball.frames", "3" }, - { "mm_lightball.delay", "1000000" }, - { "mm_lightball.anim_mode", "random" }, + { "mm_lightball.anim_mode", "random_static" }, { "mm_lightball_red", "RocksMM.png" }, { "mm_lightball_red.xpos", "12" }, { "mm_lightball_red.ypos", "2" }, @@ -5795,6 +5789,7 @@ struct ConfigInfo image_config[] = #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 +#include "conf_emp.c" // include auto-generated data structure definitions // ========================================================================== @@ -6143,6 +6138,27 @@ struct ConfigInfo image_config[] = { "menu.button_prev_level.active", UNDEFINED_FILENAME }, { "menu.button_prev_level.active.clone_from", "menu.button_left.active" }, + { "menu.button_next_level2", UNDEFINED_FILENAME }, + { "menu.button_next_level2.clone_from", "menu.button_right" }, + { "menu.button_next_level2.active", UNDEFINED_FILENAME }, + { "menu.button_next_level2.active.clone_from", "menu.button_right.active" }, + { "menu.button_prev_level2", UNDEFINED_FILENAME }, + { "menu.button_prev_level2.clone_from", "menu.button_left" }, + { "menu.button_prev_level2.active", UNDEFINED_FILENAME }, + { "menu.button_prev_level2.active.clone_from", "menu.button_left.active" }, + + { "menu.button_next_score", UNDEFINED_FILENAME }, + { "menu.button_next_score.clone_from", "menu.button_down" }, + { "menu.button_next_score.active", UNDEFINED_FILENAME }, + { "menu.button_next_score.active.clone_from", "menu.button_down.active" }, + { "menu.button_prev_score", UNDEFINED_FILENAME }, + { "menu.button_prev_score.clone_from", "menu.button_up" }, + { "menu.button_prev_score.active", UNDEFINED_FILENAME }, + { "menu.button_prev_score.active.clone_from", "menu.button_up.active" }, + + { "menu.button_play_tape", UNDEFINED_FILENAME }, + { "menu.button_play_tape.clone_from", "gfx.tape.button.play" }, + { "menu.button_name", UNDEFINED_FILENAME }, { "menu.button_name.clone_from", "menu.button" }, { "menu.button_name.active", UNDEFINED_FILENAME }, @@ -7316,6 +7332,14 @@ struct ConfigInfo image_config[] = { "global.door", "RocksDoor.png" }, + { "global.busy_initial", "RocksBusy.png" }, + { "global.busy_initial.x", "0" }, + { "global.busy_initial.y", "0" }, + { "global.busy_initial.width", "32" }, + { "global.busy_initial.height", "32" }, + { "global.busy_initial.frames", "28" }, + { "global.busy_initial.frames_per_line", "7" }, + { "global.busy_initial.delay", "2" }, { "global.busy", "RocksBusy.png" }, { "global.busy.x", "0" }, { "global.busy.y", "0" }, @@ -7324,6 +7348,14 @@ struct ConfigInfo image_config[] = { "global.busy.frames", "28" }, { "global.busy.frames_per_line", "7" }, { "global.busy.delay", "2" }, + { "global.busy_playfield", "RocksBusy.png" }, + { "global.busy_playfield.x", "0" }, + { "global.busy_playfield.y", "0" }, + { "global.busy_playfield.width", "32" }, + { "global.busy_playfield.height", "32" }, + { "global.busy_playfield.frames", "28" }, + { "global.busy_playfield.frames_per_line", "7" }, + { "global.busy_playfield.delay", "2" }, { "global.tile_cursor", "RocksMore.png" }, { "global.tile_cursor.xpos", "10" }, @@ -7331,6 +7363,8 @@ struct ConfigInfo image_config[] = { "global.tile_cursor.frames", "1" }, { "background", UNDEFINED_FILENAME }, + { "background.LOADING_INITIAL", UNDEFINED_FILENAME }, + { "background.LOADING", UNDEFINED_FILENAME }, { "background.TITLE_INITIAL", UNDEFINED_FILENAME }, { "background.TITLE", UNDEFINED_FILENAME }, { "background.MAIN", UNDEFINED_FILENAME }, @@ -7338,6 +7372,7 @@ struct ConfigInfo image_config[] = { "background.LEVELS", UNDEFINED_FILENAME }, { "background.LEVELNR", UNDEFINED_FILENAME }, { "background.SCORES", UNDEFINED_FILENAME }, + { "background.SCOREINFO", UNDEFINED_FILENAME }, { "background.EDITOR", UNDEFINED_FILENAME }, { "background.INFO", UNDEFINED_FILENAME }, { "background.INFO[ELEMENTS]", UNDEFINED_FILENAME }, @@ -7862,6 +7897,7 @@ struct ConfigInfo image_config[] = { "border.draw_masked.LEVELS", "false" }, { "border.draw_masked.LEVELNR", "false" }, { "border.draw_masked.SCORES", "false" }, + { "border.draw_masked.SCOREINFO", "false" }, { "border.draw_masked.EDITOR", "false" }, { "border.draw_masked.INFO", "false" }, { "border.draw_masked.SETUP", "false" }, @@ -7870,10 +7906,18 @@ struct ConfigInfo image_config[] = { "border.draw_masked_when_fading", "true" }, + { "init.busy_initial.x", "-1" }, + { "init.busy_initial.y", "-1" }, + { "init.busy_initial.align", "center" }, + { "init.busy_initial.valign", "middle" }, { "init.busy.x", "-1" }, { "init.busy.y", "-1" }, { "init.busy.align", "center" }, { "init.busy.valign", "middle" }, + { "init.busy_playfield.x", "-1" }, + { "init.busy_playfield.y", "-1" }, + { "init.busy_playfield.align", "center" }, + { "init.busy_playfield.valign", "middle" }, { "menu.enter_menu.fade_mode", "none" }, { "menu.enter_menu.fade_delay", "250" }, @@ -7898,6 +7942,9 @@ struct ConfigInfo image_config[] = { "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.SCOREINFO.fade_mode", ARG_DEFAULT }, + { "menu.enter_screen.SCOREINFO.fade_delay", ARG_DEFAULT }, + { "menu.enter_screen.SCOREINFO.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 }, @@ -7915,6 +7962,9 @@ struct ConfigInfo image_config[] = { "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.SCOREINFO.fade_mode", ARG_DEFAULT }, + { "menu.leave_screen.SCOREINFO.fade_delay", ARG_DEFAULT }, + { "menu.leave_screen.SCOREINFO.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 }, @@ -7945,6 +7995,8 @@ struct ConfigInfo image_config[] = { "menu.draw_yoffset.LEVELNR", "0" }, { "menu.draw_xoffset.SCORES", "0" }, { "menu.draw_yoffset.SCORES", "0" }, + { "menu.draw_xoffset.SCOREINFO", "0" }, + { "menu.draw_yoffset.SCOREINFO", "0" }, { "menu.draw_xoffset.EDITOR", "0" }, { "menu.draw_yoffset.EDITOR", "0" }, { "menu.draw_xoffset.INFO", "0" }, @@ -8012,6 +8064,7 @@ struct ConfigInfo image_config[] = { "menu.list_size.INFO[ELEMENTS]", "-1" }, { "menu.list_size.SETUP", "-1" }, + { "menu.left_spacing.SCOREINFO", "16" }, { "menu.left_spacing.INFO", "16" }, { "menu.left_spacing.INFO[TITLE]", "16" }, { "menu.left_spacing.INFO[ELEMENTS]", "16" }, @@ -8022,6 +8075,7 @@ struct ConfigInfo image_config[] = { "menu.left_spacing.INFO[LEVELSET]", "16" }, { "menu.left_spacing.SETUP[INPUT]", "16" }, + { "menu.right_spacing.SCOREINFO", "16" }, { "menu.right_spacing.INFO", "16" }, { "menu.right_spacing.INFO[TITLE]", "16" }, { "menu.right_spacing.INFO[ELEMENTS]", "16" }, @@ -8032,6 +8086,7 @@ struct ConfigInfo image_config[] = { "menu.right_spacing.INFO[LEVELSET]", "16" }, { "menu.right_spacing.SETUP[INPUT]", "16" }, + { "menu.top_spacing.SCOREINFO", "100" }, { "menu.top_spacing.INFO", "100" }, { "menu.top_spacing.INFO[TITLE]", "100" }, { "menu.top_spacing.INFO[ELEMENTS]", "100" }, @@ -8042,6 +8097,7 @@ struct ConfigInfo image_config[] = { "menu.top_spacing.INFO[LEVELSET]", "100" }, { "menu.top_spacing.SETUP[INPUT]", "100" }, + { "menu.bottom_spacing.SCOREINFO", "20" }, { "menu.bottom_spacing.INFO", "20" }, { "menu.bottom_spacing.INFO[TITLE]", "20" }, { "menu.bottom_spacing.INFO[ELEMENTS]", "20" }, @@ -8052,6 +8108,7 @@ struct ConfigInfo image_config[] = { "menu.bottom_spacing.INFO[LEVELSET]", "20" }, { "menu.bottom_spacing.SETUP[INPUT]", "20" }, + { "menu.paragraph_spacing.SCOREINFO", "-2" }, { "menu.paragraph_spacing.INFO", "-3" }, { "menu.paragraph_spacing.INFO[TITLE]", "-3" }, { "menu.paragraph_spacing.INFO[ELEMENTS]", "-3" }, @@ -8062,6 +8119,7 @@ struct ConfigInfo image_config[] = { "menu.paragraph_spacing.INFO[LEVELSET]", "-3" }, { "menu.paragraph_spacing.SETUP[INPUT]", "-1" }, + { "menu.headline1_spacing.SCOREINFO", "-2" }, { "menu.headline1_spacing.INFO", "-2" }, { "menu.headline1_spacing.INFO[TITLE]", "-2" }, { "menu.headline1_spacing.INFO[ELEMENTS]", "-2" }, @@ -8072,6 +8130,7 @@ struct ConfigInfo image_config[] = { "menu.headline1_spacing.INFO[LEVELSET]", "-2" }, { "menu.headline1_spacing.SETUP[INPUT]", "-2" }, + { "menu.headline2_spacing.SCOREINFO", "-1" }, { "menu.headline2_spacing.INFO", "-1" }, { "menu.headline2_spacing.INFO[TITLE]", "-1" }, { "menu.headline2_spacing.INFO[ELEMENTS]", "-1" }, @@ -8082,6 +8141,7 @@ struct ConfigInfo image_config[] = { "menu.headline2_spacing.INFO[LEVELSET]", "-1" }, { "menu.headline2_spacing.SETUP[INPUT]", "-1" }, + { "menu.line_spacing.SCOREINFO", "0" }, { "menu.line_spacing.INFO", "0" }, { "menu.line_spacing.INFO[TITLE]", "0" }, { "menu.line_spacing.INFO[ELEMENTS]", "0" }, @@ -8092,6 +8152,7 @@ struct ConfigInfo image_config[] = { "menu.line_spacing.INFO[LEVELSET]", "0" }, { "menu.line_spacing.SETUP[INPUT]", "0" }, + { "menu.extra_spacing.SCOREINFO", "2" }, { "menu.extra_spacing.INFO", "2" }, { "menu.extra_spacing.INFO[TITLE]", "2" }, { "menu.extra_spacing.INFO[ELEMENTS]", "2" }, @@ -8317,6 +8378,19 @@ struct ConfigInfo image_config[] = { "setup.button.touch_next2.x", "-60" }, { "setup.button.touch_next2.y", "-60" }, + { "scores.button.prev_level.x", "-1" }, + { "scores.button.prev_level.y", "-1" }, + { "scores.button.next_level.x", "-1" }, + { "scores.button.next_level.y", "-1" }, + + { "scores.button.prev_score.x", "-1" }, + { "scores.button.prev_score.y", "-1" }, + { "scores.button.next_score.x", "-1" }, + { "scores.button.next_score.y", "-1" }, + + { "scores.button.play_tape.x", "-1" }, + { "scores.button.play_tape.y", "-1" }, + { "preview.x", "272" }, { "preview.y", "380" }, { "preview.align", "center" }, @@ -8555,8 +8629,9 @@ struct ConfigInfo image_config[] = { "game.panel.inventory_count.y", "89" }, { "game.panel.inventory_count.align", "center" }, { "game.panel.inventory_count.valign", "top" }, - { "game.panel.inventory_count.digits", "3" }, + { "game.panel.inventory_count.digits", "-1" }, { "game.panel.inventory_count.font", "font.text_2" }, + { "game.panel.inventory_count.font_narrow", "font.text_1" }, { "game.panel.inventory_count.draw_masked", "true" }, { "game.panel.inventory_count.draw_order", "0" }, { "game.panel.inventory_count.class", "none" }, @@ -8754,8 +8829,9 @@ struct ConfigInfo image_config[] = { "game.panel.score.y", "159" }, { "game.panel.score.align", "center" }, { "game.panel.score.valign", "top" }, - { "game.panel.score.digits", "5" }, + { "game.panel.score.digits", "-1" }, { "game.panel.score.font", "font.text_2" }, + { "game.panel.score.font_narrow", "font.text_1" }, { "game.panel.score.draw_masked", "true" }, { "game.panel.score.draw_order", "0" }, { "game.panel.score.class", "none" }, @@ -8765,8 +8841,9 @@ struct ConfigInfo image_config[] = { "game.panel.highscore.y", "-1" }, { "game.panel.highscore.align", "left" }, { "game.panel.highscore.valign", "top" }, - { "game.panel.highscore.digits", "5" }, + { "game.panel.highscore.digits", "-1" }, { "game.panel.highscore.font", "font.text_2" }, + { "game.panel.highscore.font_narrow", "font.text_1" }, { "game.panel.highscore.draw_masked", "true" }, { "game.panel.highscore.draw_order", "0" }, { "game.panel.highscore.class", "none" },