X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=80872f45d2feb567d7ab1fcfec1a5237feb77e69;hb=9583e9c55b889974e0df9a8ca1930efdf29bda29;hp=db8957cc099200b549f8cce571bbd2c6ec0078ee;hpb=074c00b42409c74e9c5856db1be03dced3a15ae9;p=rocksndiamonds.git diff --git a/src/conf_gfx.c b/src/conf_gfx.c index db8957cc..80872f45 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -19,7 +19,7 @@ reliable default values. If that value is GFX_ARG_UNDEFINED, it will be dynamically determined, using some of the other list values. */ -struct ConfigInfo image_config_suffix[] = +struct ConfigTypeInfo image_config_suffix[] = { { ".x", ARG_UNDEFINED, TYPE_INTEGER }, { ".y", ARG_UNDEFINED, TYPE_INTEGER }, @@ -52,6 +52,7 @@ struct ConfigInfo image_config_suffix[] = { ".post_delay_fixed", ARG_UNDEFINED, TYPE_INTEGER }, { ".post_delay_random", ARG_UNDEFINED, TYPE_INTEGER }, { ".name", ARG_UNDEFINED, TYPE_STRING }, + { ".scale_up_factor", ARG_UNDEFINED, TYPE_INTEGER }, { NULL, NULL, 0 } }; @@ -463,6 +464,62 @@ struct ConfigInfo image_config[] = { "sp_gravity_port_up.EDITOR", "RocksSP.pcx" }, { "sp_gravity_port_up.EDITOR.xpos", "0" }, { "sp_gravity_port_up.EDITOR.ypos", "2" }, + { "sp_gravity_on_port_right", "RocksSP.pcx" }, + { "sp_gravity_on_port_right.xpos", "1" }, + { "sp_gravity_on_port_right.ypos", "1" }, + { "sp_gravity_on_port_right.frames", "1" }, + { "sp_gravity_on_port_right.EDITOR", "RocksSP.pcx" }, + { "sp_gravity_on_port_right.EDITOR.xpos", "5" }, + { "sp_gravity_on_port_right.EDITOR.ypos", "1" }, + { "sp_gravity_on_port_down", "RocksSP.pcx" }, + { "sp_gravity_on_port_down.xpos", "2" }, + { "sp_gravity_on_port_down.ypos", "1" }, + { "sp_gravity_on_port_down.frames", "1" }, + { "sp_gravity_on_port_down.EDITOR", "RocksSP.pcx" }, + { "sp_gravity_on_port_down.EDITOR.xpos", "6" }, + { "sp_gravity_on_port_down.EDITOR.ypos", "1" }, + { "sp_gravity_on_port_left", "RocksSP.pcx" }, + { "sp_gravity_on_port_left.xpos", "3" }, + { "sp_gravity_on_port_left.ypos", "1" }, + { "sp_gravity_on_port_left.frames", "1" }, + { "sp_gravity_on_port_left.EDITOR", "RocksSP.pcx" }, + { "sp_gravity_on_port_left.EDITOR.xpos", "7" }, + { "sp_gravity_on_port_left.EDITOR.ypos", "1" }, + { "sp_gravity_on_port_up", "RocksSP.pcx" }, + { "sp_gravity_on_port_up.xpos", "4" }, + { "sp_gravity_on_port_up.ypos", "1" }, + { "sp_gravity_on_port_up.frames", "1" }, + { "sp_gravity_on_port_up.EDITOR", "RocksSP.pcx" }, + { "sp_gravity_on_port_up.EDITOR.xpos", "0" }, + { "sp_gravity_on_port_up.EDITOR.ypos", "2" }, + { "sp_gravity_off_port_right", "RocksSP.pcx" }, + { "sp_gravity_off_port_right.xpos", "1" }, + { "sp_gravity_off_port_right.ypos", "1" }, + { "sp_gravity_off_port_right.frames", "1" }, + { "sp_gravity_off_port_right.EDITOR", "RocksSP.pcx" }, + { "sp_gravity_off_port_right.EDITOR.xpos", "5" }, + { "sp_gravity_off_port_right.EDITOR.ypos", "1" }, + { "sp_gravity_off_port_down", "RocksSP.pcx" }, + { "sp_gravity_off_port_down.xpos", "2" }, + { "sp_gravity_off_port_down.ypos", "1" }, + { "sp_gravity_off_port_down.frames", "1" }, + { "sp_gravity_off_port_down.EDITOR", "RocksSP.pcx" }, + { "sp_gravity_off_port_down.EDITOR.xpos", "6" }, + { "sp_gravity_off_port_down.EDITOR.ypos", "1" }, + { "sp_gravity_off_port_left", "RocksSP.pcx" }, + { "sp_gravity_off_port_left.xpos", "3" }, + { "sp_gravity_off_port_left.ypos", "1" }, + { "sp_gravity_off_port_left.frames", "1" }, + { "sp_gravity_off_port_left.EDITOR", "RocksSP.pcx" }, + { "sp_gravity_off_port_left.EDITOR.xpos", "7" }, + { "sp_gravity_off_port_left.EDITOR.ypos", "1" }, + { "sp_gravity_off_port_up", "RocksSP.pcx" }, + { "sp_gravity_off_port_up.xpos", "4" }, + { "sp_gravity_off_port_up.ypos", "1" }, + { "sp_gravity_off_port_up.frames", "1" }, + { "sp_gravity_off_port_up.EDITOR", "RocksSP.pcx" }, + { "sp_gravity_off_port_up.EDITOR.xpos", "0" }, + { "sp_gravity_off_port_up.EDITOR.ypos", "2" }, { "sp_sniksnak", "RocksSP.pcx" }, { "sp_sniksnak.xpos", "1" }, @@ -3160,6 +3217,86 @@ struct ConfigInfo image_config[] = { "trigger_player.ypos", "13" }, { "trigger_player.frames", "1" }, + { "balloon_switch_none", "emc_object.pcx" }, + { "balloon_switch_none.xpos", "24" }, + { "balloon_switch_none.ypos", "23" }, + { "balloon_switch_none.frames", "1" }, + { "balloon_switch_none.scale_up_factor", "2" }, + + { "emc_android", "emc_object.pcx" }, + { "emc_android.xpos", "7" }, + { "emc_android.ypos", "13" }, + { "emc_android.frames", "1" }, + { "emc_android.scale_up_factor", "2" }, + + { "emc_generator_ball", "emc_object.pcx" }, + { "emc_generator_ball.xpos", "22" }, + { "emc_generator_ball.ypos", "18" }, + { "emc_generator_ball.frames", "1" }, + { "emc_generator_ball.scale_up_factor", "2" }, + + { "emc_gate_5", "emc_object.pcx" }, + { "emc_gate_5.xpos", "24" }, + { "emc_gate_5.ypos", "6" }, + { "emc_gate_5.frames", "1" }, + { "emc_gate_5.scale_up_factor", "2" }, + { "emc_gate_5_gray", "emc_object.pcx" }, + { "emc_gate_5_gray.xpos", "25" }, + { "emc_gate_5_gray.ypos", "18" }, + { "emc_gate_5_gray.frames", "1" }, + { "emc_gate_5_gray.scale_up_factor", "2" }, + { "emc_gate_6", "emc_object.pcx" }, + { "emc_gate_6.xpos", "24" }, + { "emc_gate_6.ypos", "7" }, + { "emc_gate_6.frames", "1" }, + { "emc_gate_6.scale_up_factor", "2" }, + { "emc_gate_6_gray", "emc_object.pcx" }, + { "emc_gate_6_gray.xpos", "25" }, + { "emc_gate_6_gray.ypos", "18" }, + { "emc_gate_6_gray.frames", "1" }, + { "emc_gate_6_gray.scale_up_factor", "2" }, + { "emc_gate_7", "emc_object.pcx" }, + { "emc_gate_7.xpos", "24" }, + { "emc_gate_7.ypos", "8" }, + { "emc_gate_7.frames", "1" }, + { "emc_gate_7.scale_up_factor", "2" }, + { "emc_gate_7_gray", "emc_object.pcx" }, + { "emc_gate_7_gray.xpos", "25" }, + { "emc_gate_7_gray.ypos", "18" }, + { "emc_gate_7_gray.frames", "1" }, + { "emc_gate_7_gray.scale_up_factor", "2" }, + { "emc_gate_8", "emc_object.pcx" }, + { "emc_gate_8.xpos", "24" }, + { "emc_gate_8.ypos", "9" }, + { "emc_gate_8.frames", "1" }, + { "emc_gate_8.scale_up_factor", "2" }, + { "emc_gate_8_gray", "emc_object.pcx" }, + { "emc_gate_8_gray.xpos", "25" }, + { "emc_gate_8_gray.ypos", "18" }, + { "emc_gate_8_gray.frames", "1" }, + { "emc_gate_8_gray.scale_up_factor", "2" }, + + { "emc_key_5", "emc_object.pcx" }, + { "emc_key_5.xpos", "24" }, + { "emc_key_5.ypos", "14" }, + { "emc_key_5.frames", "1" }, + { "emc_key_5.scale_up_factor", "2" }, + { "emc_key_6", "emc_object.pcx" }, + { "emc_key_6.xpos", "24" }, + { "emc_key_6.ypos", "15" }, + { "emc_key_6.frames", "1" }, + { "emc_key_6.scale_up_factor", "2" }, + { "emc_key_7", "emc_object.pcx" }, + { "emc_key_7.xpos", "24" }, + { "emc_key_7.ypos", "16" }, + { "emc_key_7.frames", "1" }, + { "emc_key_7.scale_up_factor", "2" }, + { "emc_key_8", "emc_object.pcx" }, + { "emc_key_8.xpos", "24" }, + { "emc_key_8.ypos", "17" }, + { "emc_key_8.frames", "1" }, + { "emc_key_8.scale_up_factor", "2" }, + #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 */ @@ -3167,6 +3304,14 @@ struct ConfigInfo image_config[] = /* images not associated to game elements (used for menu screens etc.) */ /* keyword to stop parser: "NO_MORE_ELEMENT_IMAGES" <-- do not change! */ + /* !!! TEMPORARILY STORED HERE -- PROBABLY TO BE CHANGED !!! */ + + { "emc_object", "emc_object.pcx" }, + { "emc_object.scale_up_factor", "2" }, + + { "emc_sprite", "emc_sprite.pcx" }, + { "emc_sprite.scale_up_factor", "2" }, + { "toon_1", "RocksToons.pcx" }, { "toon_1.x", "2" }, { "toon_1.y", "72" }, @@ -3708,6 +3853,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 },