X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fconf_gfx.c;h=5075ee37cd2cccf182e39ca35cc55f14c2ccd022;hp=1fa9a01ec4fcd24eda37ab34e189d15dbb808b82;hb=2965766321c0bc9b8985b3760a624ea9ef8e44e5;hpb=063fcfffebc7960fedb0e468a6b20821e387d403 diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 1fa9a01e..5075ee37 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -56,10 +56,13 @@ struct ConfigTypeInfo image_config_suffix[] = { ".draw_order", ARG_UNDEFINED, TYPE_INTEGER }, { ".init_delay_fixed", ARG_UNDEFINED, TYPE_INTEGER }, { ".init_delay_random", ARG_UNDEFINED, TYPE_INTEGER }, + { ".init_delay_action", ARG_UNDEFINED, TYPE_STRING }, { ".anim_delay_fixed", ARG_UNDEFINED, TYPE_INTEGER }, { ".anim_delay_random", ARG_UNDEFINED, TYPE_INTEGER }, + { ".anim_delay_action", ARG_UNDEFINED, TYPE_STRING }, { ".post_delay_fixed", ARG_UNDEFINED, TYPE_INTEGER }, { ".post_delay_random", ARG_UNDEFINED, TYPE_INTEGER }, + { ".post_delay_action", ARG_UNDEFINED, TYPE_STRING }, { ".init_event", ARG_UNDEFINED, TYPE_STRING }, { ".init_event_action", ARG_UNDEFINED, TYPE_STRING }, { ".anim_event", ARG_UNDEFINED, TYPE_STRING }, @@ -72,6 +75,7 @@ struct ConfigTypeInfo image_config_suffix[] = { ".fade_delay", ARG_UNDEFINED, TYPE_INTEGER }, { ".post_delay", ARG_UNDEFINED, TYPE_INTEGER }, { ".auto_delay", ARG_UNDEFINED, TYPE_INTEGER }, + { ".auto_delay_unit", ARG_UNDEFINED, TYPE_INTEGER }, { ".align", ARG_UNDEFINED, TYPE_INTEGER }, { ".valign", ARG_UNDEFINED, TYPE_INTEGER }, { ".sort_priority", ARG_UNDEFINED, TYPE_INTEGER }, @@ -837,9 +841,6 @@ struct ConfigInfo image_config[] = { "sokoban_object.xpos", "9" }, { "sokoban_object.ypos", "7" }, { "sokoban_object.frames", "1" }, - { "sokoban_object.EDITOR", "RocksElements.png" }, - { "sokoban_object.EDITOR.xpos", "2" }, - { "sokoban_object.EDITOR.ypos", "14" }, { "sokoban_field_empty", "RocksElements.png" }, { "sokoban_field_empty.xpos", "10" }, @@ -855,9 +856,6 @@ struct ConfigInfo image_config[] = { "sokoban_field_player.xpos", "0" }, { "sokoban_field_player.ypos", "15" }, { "sokoban_field_player.frames", "1" }, - { "sokoban_field_player.EDITOR", "RocksHeroes.png" }, - { "sokoban_field_player.EDITOR.xpos", "1" }, - { "sokoban_field_player.EDITOR.ypos", "15" }, // images for Emerald Mine style elements and actions @@ -1029,18 +1027,12 @@ struct ConfigInfo image_config[] = { "dynamite.xpos", "0" }, { "dynamite.ypos", "3" }, { "dynamite.frames", "1" }, - { "dynamite.EDITOR", "RocksElements.png" }, - { "dynamite.EDITOR.xpos", "0" }, - { "dynamite.EDITOR.ypos", "14" }, { "dynamite.active", "RocksElements.png" }, { "dynamite.active.xpos", "1" }, { "dynamite.active.ypos", "3" }, { "dynamite.active.frames", "7" }, { "dynamite.active.delay", "12" }, { "dynamite.active.anim_mode", "linear" }, - { "dynamite.active.EDITOR", "RocksElements.png" }, - { "dynamite.active.EDITOR.xpos", "1" }, - { "dynamite.active.EDITOR.ypos", "14" }, { "em_dynamite", "RocksEMC.png" }, { "em_dynamite.xpos", "0" }, @@ -2543,30 +2535,18 @@ struct ConfigInfo image_config[] = { "key_1.xpos", "4" }, { "key_1.ypos", "1" }, { "key_1.frames", "1" }, - { "key_1.EDITOR", "RocksElements.png" }, - { "key_1.EDITOR.xpos", "4" }, - { "key_1.EDITOR.ypos", "14" }, { "key_2", "RocksElements.png" }, { "key_2.xpos", "5" }, { "key_2.ypos", "1" }, { "key_2.frames", "1" }, - { "key_2.EDITOR", "RocksElements.png" }, - { "key_2.EDITOR.xpos", "5" }, - { "key_2.EDITOR.ypos", "14" }, { "key_3", "RocksElements.png" }, { "key_3.xpos", "6" }, { "key_3.ypos", "1" }, { "key_3.frames", "1" }, - { "key_3.EDITOR", "RocksElements.png" }, - { "key_3.EDITOR.xpos", "6" }, - { "key_3.EDITOR.ypos", "14" }, { "key_4", "RocksElements.png" }, { "key_4.xpos", "7" }, { "key_4.ypos", "1" }, { "key_4.frames", "1" }, - { "key_4.EDITOR", "RocksElements.png" }, - { "key_4.EDITOR.xpos", "7" }, - { "key_4.EDITOR.ypos", "14" }, { "gate_1", "RocksElements.png" }, { "gate_1.xpos", "4" }, @@ -2688,9 +2668,6 @@ struct ConfigInfo image_config[] = { "lamp.xpos", "0" }, { "lamp.ypos", "7" }, { "lamp.frames", "1" }, - { "lamp.EDITOR", "RocksElements.png" }, - { "lamp.EDITOR.xpos", "2" }, - { "lamp.EDITOR.ypos", "14" }, { "lamp.active", "RocksElements.png" }, { "lamp.active.xpos", "1" }, { "lamp.active.ypos", "7" }, @@ -3133,9 +3110,6 @@ struct ConfigInfo image_config[] = { "penguin.xpos", "8" }, { "penguin.ypos", "6" }, { "penguin.frames", "1" }, - { "penguin.EDITOR", "RocksElements.png" }, - { "penguin.EDITOR.xpos", "12" }, - { "penguin.EDITOR.ypos", "14" }, { "penguin.down", "RocksHeroes.png" }, { "penguin.down.xpos", "8" }, { "penguin.down.ypos", "6" }, @@ -3255,9 +3229,6 @@ struct ConfigInfo image_config[] = { "player_1.xpos", "0" }, { "player_1.ypos", "0" }, { "player_1.frames", "1" }, - { "player_1.EDITOR", "RocksElements.png" }, - { "player_1.EDITOR.xpos", "4" }, - { "player_1.EDITOR.ypos", "7" }, { "player_1.down", "RocksHeroes.png" }, { "player_1.down.xpos", "0" }, { "player_1.down.ypos", "0" }, @@ -3387,9 +3358,6 @@ struct ConfigInfo image_config[] = { "player_2.xpos", "0" }, { "player_2.ypos", "3" }, { "player_2.frames", "1" }, - { "player_2.EDITOR", "RocksElements.png" }, - { "player_2.EDITOR.xpos", "5" }, - { "player_2.EDITOR.ypos", "7" }, { "player_2.down", "RocksHeroes.png" }, { "player_2.down.xpos", "0" }, { "player_2.down.ypos", "3" }, @@ -3519,9 +3487,6 @@ struct ConfigInfo image_config[] = { "player_3.xpos", "0" }, { "player_3.ypos", "6" }, { "player_3.frames", "1" }, - { "player_3.EDITOR", "RocksElements.png" }, - { "player_3.EDITOR.xpos", "6" }, - { "player_3.EDITOR.ypos", "7" }, { "player_3.down", "RocksHeroes.png" }, { "player_3.down.xpos", "0" }, { "player_3.down.ypos", "6" }, @@ -3651,9 +3616,6 @@ struct ConfigInfo image_config[] = { "player_4.xpos", "0" }, { "player_4.ypos", "9" }, { "player_4.frames", "1" }, - { "player_4.EDITOR", "RocksElements.png" }, - { "player_4.EDITOR.xpos", "7" }, - { "player_4.EDITOR.ypos", "7" }, { "player_4.down", "RocksHeroes.png" }, { "player_4.down.xpos", "0" }, { "player_4.down.ypos", "9" }, @@ -7372,72 +7334,86 @@ struct ConfigInfo image_config[] = { "[title_initial].fade_delay", "500" }, { "[title_initial].post_delay", "250" }, { "[title_initial].auto_delay", "-1" }, + { "[title_initial].auto_delay_unit", "ms" }, { "[title].fade_mode", "fade" }, { "[title].fade_delay", "500" }, { "[title].post_delay", "250" }, { "[title].auto_delay", "-1" }, + { "[title].auto_delay_unit", "ms" }, { "[titlescreen_initial].sort_priority", "0" }, { "[titlescreen_initial].fade_mode", ARG_DEFAULT }, { "[titlescreen_initial].fade_delay", ARG_DEFAULT }, { "[titlescreen_initial].post_delay", ARG_DEFAULT }, { "[titlescreen_initial].auto_delay", ARG_DEFAULT }, + { "[titlescreen_initial].auto_delay_unit", ARG_DEFAULT }, { "[titlescreen].sort_priority", "0" }, { "[titlescreen].fade_mode", ARG_DEFAULT }, { "[titlescreen].fade_delay", ARG_DEFAULT }, { "[titlescreen].post_delay", ARG_DEFAULT }, { "[titlescreen].auto_delay", ARG_DEFAULT }, + { "[titlescreen].auto_delay_unit", ARG_DEFAULT }, { "titlescreen_initial_1.sort_priority", ARG_DEFAULT }, { "titlescreen_initial_1.fade_mode", ARG_DEFAULT }, { "titlescreen_initial_1.fade_delay", ARG_DEFAULT }, { "titlescreen_initial_1.post_delay", ARG_DEFAULT }, { "titlescreen_initial_1.auto_delay", ARG_DEFAULT }, + { "titlescreen_initial_1.auto_delay_unit", ARG_DEFAULT }, { "titlescreen_initial_2.sort_priority", ARG_DEFAULT }, { "titlescreen_initial_2.fade_mode", ARG_DEFAULT }, { "titlescreen_initial_2.fade_delay", ARG_DEFAULT }, { "titlescreen_initial_2.post_delay", ARG_DEFAULT }, { "titlescreen_initial_2.auto_delay", ARG_DEFAULT }, + { "titlescreen_initial_2.auto_delay_unit", ARG_DEFAULT }, { "titlescreen_initial_3.sort_priority", ARG_DEFAULT }, { "titlescreen_initial_3.fade_mode", ARG_DEFAULT }, { "titlescreen_initial_3.fade_delay", ARG_DEFAULT }, { "titlescreen_initial_3.post_delay", ARG_DEFAULT }, { "titlescreen_initial_3.auto_delay", ARG_DEFAULT }, + { "titlescreen_initial_3.auto_delay_unit", ARG_DEFAULT }, { "titlescreen_initial_4.sort_priority", ARG_DEFAULT }, { "titlescreen_initial_4.fade_mode", ARG_DEFAULT }, { "titlescreen_initial_4.fade_delay", ARG_DEFAULT }, { "titlescreen_initial_4.post_delay", ARG_DEFAULT }, { "titlescreen_initial_4.auto_delay", ARG_DEFAULT }, + { "titlescreen_initial_4.auto_delay_unit", ARG_DEFAULT }, { "titlescreen_initial_5.sort_priority", ARG_DEFAULT }, { "titlescreen_initial_5.fade_mode", ARG_DEFAULT }, { "titlescreen_initial_5.fade_delay", ARG_DEFAULT }, { "titlescreen_initial_5.post_delay", ARG_DEFAULT }, { "titlescreen_initial_5.auto_delay", ARG_DEFAULT }, + { "titlescreen_initial_5.auto_delay_unit", ARG_DEFAULT }, { "titlescreen_1.sort_priority", ARG_DEFAULT }, { "titlescreen_1.fade_mode", ARG_DEFAULT }, { "titlescreen_1.fade_delay", ARG_DEFAULT }, { "titlescreen_1.post_delay", ARG_DEFAULT }, { "titlescreen_1.auto_delay", ARG_DEFAULT }, + { "titlescreen_1.auto_delay_unit", ARG_DEFAULT }, { "titlescreen_2.sort_priority", ARG_DEFAULT }, { "titlescreen_2.fade_mode", ARG_DEFAULT }, { "titlescreen_2.fade_delay", ARG_DEFAULT }, { "titlescreen_2.post_delay", ARG_DEFAULT }, { "titlescreen_2.auto_delay", ARG_DEFAULT }, + { "titlescreen_2.auto_delay_unit", ARG_DEFAULT }, { "titlescreen_3.sort_priority", ARG_DEFAULT }, { "titlescreen_3.fade_mode", ARG_DEFAULT }, { "titlescreen_3.fade_delay", ARG_DEFAULT }, { "titlescreen_3.post_delay", ARG_DEFAULT }, { "titlescreen_3.auto_delay", ARG_DEFAULT }, + { "titlescreen_3.auto_delay_unit", ARG_DEFAULT }, { "titlescreen_4.sort_priority", ARG_DEFAULT }, { "titlescreen_4.fade_mode", ARG_DEFAULT }, { "titlescreen_4.fade_delay", ARG_DEFAULT }, { "titlescreen_4.post_delay", ARG_DEFAULT }, { "titlescreen_4.auto_delay", ARG_DEFAULT }, + { "titlescreen_4.auto_delay_unit", ARG_DEFAULT }, { "titlescreen_5.sort_priority", ARG_DEFAULT }, { "titlescreen_5.fade_mode", ARG_DEFAULT }, { "titlescreen_5.fade_delay", ARG_DEFAULT }, { "titlescreen_5.post_delay", ARG_DEFAULT }, { "titlescreen_5.auto_delay", ARG_DEFAULT }, + { "titlescreen_5.auto_delay_unit", ARG_DEFAULT }, { "[titlemessage_initial].x", "-1" }, { "[titlemessage_initial].y", "-1" }, @@ -7456,6 +7432,7 @@ struct ConfigInfo image_config[] = { "[titlemessage_initial].fade_delay", ARG_DEFAULT }, { "[titlemessage_initial].post_delay", ARG_DEFAULT }, { "[titlemessage_initial].auto_delay", ARG_DEFAULT }, + { "[titlemessage_initial].auto_delay_unit", ARG_DEFAULT }, { "[titlemessage].x", "-1" }, { "[titlemessage].y", "-1" }, { "[titlemessage].width", "-1" }, @@ -7473,6 +7450,7 @@ struct ConfigInfo image_config[] = { "[titlemessage].fade_delay", ARG_DEFAULT }, { "[titlemessage].post_delay", ARG_DEFAULT }, { "[titlemessage].auto_delay", ARG_DEFAULT }, + { "[titlemessage].auto_delay_unit", ARG_DEFAULT }, { "titlemessage_initial_1.x", ARG_DEFAULT }, { "titlemessage_initial_1.y", ARG_DEFAULT }, @@ -7491,6 +7469,7 @@ struct ConfigInfo image_config[] = { "titlemessage_initial_1.fade_delay", ARG_DEFAULT }, { "titlemessage_initial_1.post_delay", ARG_DEFAULT }, { "titlemessage_initial_1.auto_delay", ARG_DEFAULT }, + { "titlemessage_initial_1.auto_delay_unit", ARG_DEFAULT }, { "titlemessage_initial_2.x", ARG_DEFAULT }, { "titlemessage_initial_2.y", ARG_DEFAULT }, { "titlemessage_initial_2.width", ARG_DEFAULT }, @@ -7508,6 +7487,7 @@ struct ConfigInfo image_config[] = { "titlemessage_initial_2.fade_delay", ARG_DEFAULT }, { "titlemessage_initial_2.post_delay", ARG_DEFAULT }, { "titlemessage_initial_2.auto_delay", ARG_DEFAULT }, + { "titlemessage_initial_2.auto_delay_unit", ARG_DEFAULT }, { "titlemessage_initial_3.x", ARG_DEFAULT }, { "titlemessage_initial_3.y", ARG_DEFAULT }, { "titlemessage_initial_3.width", ARG_DEFAULT }, @@ -7525,6 +7505,7 @@ struct ConfigInfo image_config[] = { "titlemessage_initial_3.fade_delay", ARG_DEFAULT }, { "titlemessage_initial_3.post_delay", ARG_DEFAULT }, { "titlemessage_initial_3.auto_delay", ARG_DEFAULT }, + { "titlemessage_initial_3.auto_delay_unit", ARG_DEFAULT }, { "titlemessage_initial_4.x", ARG_DEFAULT }, { "titlemessage_initial_4.y", ARG_DEFAULT }, { "titlemessage_initial_4.width", ARG_DEFAULT }, @@ -7542,6 +7523,7 @@ struct ConfigInfo image_config[] = { "titlemessage_initial_4.fade_delay", ARG_DEFAULT }, { "titlemessage_initial_4.post_delay", ARG_DEFAULT }, { "titlemessage_initial_4.auto_delay", ARG_DEFAULT }, + { "titlemessage_initial_4.auto_delay_unit", ARG_DEFAULT }, { "titlemessage_initial_5.x", ARG_DEFAULT }, { "titlemessage_initial_5.y", ARG_DEFAULT }, { "titlemessage_initial_5.width", ARG_DEFAULT }, @@ -7559,6 +7541,7 @@ struct ConfigInfo image_config[] = { "titlemessage_initial_5.fade_delay", ARG_DEFAULT }, { "titlemessage_initial_5.post_delay", ARG_DEFAULT }, { "titlemessage_initial_5.auto_delay", ARG_DEFAULT }, + { "titlemessage_initial_5.auto_delay_unit", ARG_DEFAULT }, { "titlemessage_1.x", ARG_DEFAULT }, { "titlemessage_1.y", ARG_DEFAULT }, { "titlemessage_1.width", ARG_DEFAULT }, @@ -7576,6 +7559,7 @@ struct ConfigInfo image_config[] = { "titlemessage_1.fade_delay", ARG_DEFAULT }, { "titlemessage_1.post_delay", ARG_DEFAULT }, { "titlemessage_1.auto_delay", ARG_DEFAULT }, + { "titlemessage_1.auto_delay_unit", ARG_DEFAULT }, { "titlemessage_2.x", ARG_DEFAULT }, { "titlemessage_2.y", ARG_DEFAULT }, { "titlemessage_2.width", ARG_DEFAULT }, @@ -7593,6 +7577,7 @@ struct ConfigInfo image_config[] = { "titlemessage_2.fade_delay", ARG_DEFAULT }, { "titlemessage_2.post_delay", ARG_DEFAULT }, { "titlemessage_2.auto_delay", ARG_DEFAULT }, + { "titlemessage_2.auto_delay_unit", ARG_DEFAULT }, { "titlemessage_3.x", ARG_DEFAULT }, { "titlemessage_3.y", ARG_DEFAULT }, { "titlemessage_3.width", ARG_DEFAULT }, @@ -7610,6 +7595,7 @@ struct ConfigInfo image_config[] = { "titlemessage_3.fade_delay", ARG_DEFAULT }, { "titlemessage_3.post_delay", ARG_DEFAULT }, { "titlemessage_3.auto_delay", ARG_DEFAULT }, + { "titlemessage_3.auto_delay_unit", ARG_DEFAULT }, { "titlemessage_4.x", ARG_DEFAULT }, { "titlemessage_4.y", ARG_DEFAULT }, { "titlemessage_4.width", ARG_DEFAULT }, @@ -7627,6 +7613,7 @@ struct ConfigInfo image_config[] = { "titlemessage_4.fade_delay", ARG_DEFAULT }, { "titlemessage_4.post_delay", ARG_DEFAULT }, { "titlemessage_4.auto_delay", ARG_DEFAULT }, + { "titlemessage_4.auto_delay_unit", ARG_DEFAULT }, { "titlemessage_5.x", ARG_DEFAULT }, { "titlemessage_5.y", ARG_DEFAULT }, { "titlemessage_5.width", ARG_DEFAULT }, @@ -7644,6 +7631,7 @@ struct ConfigInfo image_config[] = { "titlemessage_5.fade_delay", ARG_DEFAULT }, { "titlemessage_5.post_delay", ARG_DEFAULT }, { "titlemessage_5.auto_delay", ARG_DEFAULT }, + { "titlemessage_5.auto_delay_unit", ARG_DEFAULT }, { "readme.x", "-1" }, { "readme.y", "-1" }, @@ -7698,6 +7686,7 @@ struct ConfigInfo image_config[] = { "menu.enter_screen.TITLE.fade_delay", "500" }, { "menu.enter_screen.TITLE.post_delay", "250" }, { "menu.enter_screen.TITLE.auto_delay", "-1" }, + { "menu.enter_screen.TITLE.auto_delay_unit", "-1" }, { "menu.enter_screen.SCORES.fade_mode", ARG_DEFAULT }, { "menu.enter_screen.SCORES.fade_delay", ARG_DEFAULT }, { "menu.enter_screen.SCORES.post_delay", ARG_DEFAULT }, @@ -7714,6 +7703,7 @@ struct ConfigInfo image_config[] = { "menu.leave_screen.TITLE.fade_delay", "500" }, { "menu.leave_screen.TITLE.post_delay", "250" }, { "menu.leave_screen.TITLE.auto_delay", "-1" }, + { "menu.leave_screen.TITLE.auto_delay_unit", "-1" }, { "menu.leave_screen.SCORES.fade_mode", ARG_DEFAULT }, { "menu.leave_screen.SCORES.fade_delay", ARG_DEFAULT }, { "menu.leave_screen.SCORES.post_delay", ARG_DEFAULT }, @@ -7730,6 +7720,7 @@ struct ConfigInfo image_config[] = { "menu.next_screen.TITLE.fade_delay", "500" }, { "menu.next_screen.TITLE.post_delay", "250" }, { "menu.next_screen.TITLE.auto_delay", "-1" }, + { "menu.next_screen.TITLE.auto_delay_unit", "-1" }, { "menu.next_screen.INFO.fade_mode", ARG_DEFAULT }, { "menu.next_screen.INFO.fade_delay", ARG_DEFAULT }, { "menu.next_screen.INFO.post_delay", ARG_DEFAULT }, @@ -7797,6 +7788,9 @@ struct ConfigInfo image_config[] = { "menu.scrollbar_xoffset", "0" }, + { "menu.list.SETUP[CHOOSE_OTHER].align", "left" }, + { "menu.list.SETUP[CHOOSE_OTHER].valign", "top" }, + { "menu.list_size", "-1" }, { "menu.list_size.LEVELS", "-1" }, { "menu.list_size.LEVELNR", "-1" },