X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fconf_gfx.c;h=bc6e1e5e378d22d2d7125599ee25778794fb0cfe;hp=1fa9a01ec4fcd24eda37ab34e189d15dbb808b82;hb=56d8384fddc8e74f5327b28986f366927c3b2040;hpb=063fcfffebc7960fedb0e468a6b20821e387d403 diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 1fa9a01e..bc6e1e5e 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 }, @@ -837,9 +840,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 +855,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 +1026,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 +2534,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 +2667,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 +3109,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 +3228,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 +3357,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 +3486,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 +3615,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" }, @@ -7797,6 +7758,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" },