X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=f507f3015b669aed49dfc6350b98ad81e4576bd8;hb=6c36934381566ea155d67a1177d2857dc44f85de;hp=1bca3da12807cd569b8432c09aa40f928b9ce795;hpb=891c39ca37c4fea5f6cc4ca40f913a56c68ef495;p=rocksndiamonds.git diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 1bca3da1..f507f301 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -436,21 +436,33 @@ struct ConfigInfo image_config[] = { "sp_port_any.ypos", "2" }, { "sp_port_any.frames", "1" }, { "sp_gravity_port_right", "RocksSP.pcx" }, - { "sp_gravity_port_right.xpos", "5" }, + { "sp_gravity_port_right.xpos", "1" }, { "sp_gravity_port_right.ypos", "1" }, { "sp_gravity_port_right.frames", "1" }, + { "sp_gravity_port_right.EDITOR", "RocksSP.pcx" }, + { "sp_gravity_port_right.EDITOR.xpos", "5" }, + { "sp_gravity_port_right.EDITOR.ypos", "1" }, { "sp_gravity_port_down", "RocksSP.pcx" }, - { "sp_gravity_port_down.xpos", "6" }, + { "sp_gravity_port_down.xpos", "2" }, { "sp_gravity_port_down.ypos", "1" }, { "sp_gravity_port_down.frames", "1" }, + { "sp_gravity_port_down.EDITOR", "RocksSP.pcx" }, + { "sp_gravity_port_down.EDITOR.xpos", "6" }, + { "sp_gravity_port_down.EDITOR.ypos", "1" }, { "sp_gravity_port_left", "RocksSP.pcx" }, - { "sp_gravity_port_left.xpos", "7" }, + { "sp_gravity_port_left.xpos", "3" }, { "sp_gravity_port_left.ypos", "1" }, { "sp_gravity_port_left.frames", "1" }, + { "sp_gravity_port_left.EDITOR", "RocksSP.pcx" }, + { "sp_gravity_port_left.EDITOR.xpos", "7" }, + { "sp_gravity_port_left.EDITOR.ypos", "1" }, { "sp_gravity_port_up", "RocksSP.pcx" }, - { "sp_gravity_port_up.xpos", "0" }, - { "sp_gravity_port_up.ypos", "2" }, + { "sp_gravity_port_up.xpos", "4" }, + { "sp_gravity_port_up.ypos", "1" }, { "sp_gravity_port_up.frames", "1" }, + { "sp_gravity_port_up.EDITOR", "RocksSP.pcx" }, + { "sp_gravity_port_up.EDITOR.xpos", "0" }, + { "sp_gravity_port_up.EDITOR.ypos", "2" }, { "sp_sniksnak", "RocksSP.pcx" }, { "sp_sniksnak.xpos", "1" }, @@ -537,7 +549,8 @@ struct ConfigInfo image_config[] = { "sp_electron.xpos", "8" }, { "sp_electron.ypos", "10" }, { "sp_electron.frames", "8" }, - { "sp_electron.delay", "2" }, + { "sp_electron.delay", "4" }, + { "sp_electron.global_sync", "true" }, { "sp_electron.EDITOR", "RocksSP.pcx" }, { "sp_electron.EDITOR.xpos", "10" }, { "sp_electron.EDITOR.ypos", "11" }, @@ -624,6 +637,14 @@ struct ConfigInfo image_config[] = { "sokoban_field_full.ypos", "7" }, { "sokoban_field_full.frames", "1" }, + { "sokoban_field_player", "RocksHeroes.pcx" }, + { "sokoban_field_player.xpos", "0" }, + { "sokoban_field_player.ypos", "15" }, + { "sokoban_field_player.frames", "1" }, + { "sokoban_field_player.EDITOR", "RocksHeroes.pcx" }, + { "sokoban_field_player.EDITOR.xpos", "1" }, + { "sokoban_field_player.EDITOR.ypos", "15" }, + /* images for Emerald Mine style elements and actions */ { "empty_space", "RocksSP.pcx" }, @@ -3124,8 +3145,24 @@ struct ConfigInfo image_config[] = { "arrow_down.ypos", "8" }, { "arrow_down.frames", "1" }, + { "unknown", "RocksFontEM.pcx" }, + { "unknown.xpos", "15" }, + { "unknown.ypos", "1" }, + { "unknown.frames", "1" }, + + { "trigger_element", "RocksDC.pcx" }, + { "trigger_element.xpos", "15" }, + { "trigger_element.ypos", "14" }, + { "trigger_element.frames", "1" }, + + { "trigger_player", "RocksDC.pcx" }, + { "trigger_player.xpos", "15" }, + { "trigger_player.ypos", "13" }, + { "trigger_player.frames", "1" }, + #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 */ /* images not associated to game elements (used for menu screens etc.) */ /* keyword to stop parser: "NO_MORE_ELEMENT_IMAGES" <-- do not change! */ @@ -3671,6 +3708,7 @@ struct ConfigInfo image_config[] = { "background.SCORES", UNDEFINED_FILENAME }, { "background.EDITOR", UNDEFINED_FILENAME }, { "background.INFO", UNDEFINED_FILENAME }, + { "background.INFO[ELEMENTS]", UNDEFINED_FILENAME }, { "background.SETUP", UNDEFINED_FILENAME }, { "background.DOOR", UNDEFINED_FILENAME }, @@ -3708,10 +3746,10 @@ struct ConfigInfo image_config[] = { "door_2.step_delay", "10" }, { "door_2.anim_mode", "default" }, - { "[player].boring_delay_fixed", "0" }, - { "[player].boring_delay_random", "0" }, - { "[player].sleeping_delay_fixed", "0" }, - { "[player].sleeping_delay_random", "0" }, + { "[player].boring_delay_fixed", "-1" }, + { "[player].boring_delay_random", "-1" }, + { "[player].sleeping_delay_fixed", "-1" }, + { "[player].sleeping_delay_random", "-1" }, { NULL, NULL } };