X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=74ef40841d4376de60d9ebf8a4d4d3e189984f38;hb=73dd81c85be90e466493bcc6f45c402d29bc7f20;hp=c7afe9ea99c1010fbf0c13f4761d30f666190269;hpb=2e21f241598593b6a6a3e710287c49b6636884de;p=rocksndiamonds.git diff --git a/src/conf_gfx.c b/src/conf_gfx.c index c7afe9ea..74ef4084 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" }, @@ -549,7 +606,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" }, @@ -1341,18 +1399,21 @@ struct ConfigInfo image_config[] = { "emc_steelwall_1.xpos", "14" }, { "emc_steelwall_1.ypos", "0" }, { "emc_steelwall_1.frames", "1" }, - { "emc_steelwall_2", "RocksDC.pcx" }, - { "emc_steelwall_2.xpos", "14" }, - { "emc_steelwall_2.ypos", "0" }, + { "emc_steelwall_2", "emc_object.pcx" }, + { "emc_steelwall_2.xpos", "25" }, + { "emc_steelwall_2.ypos", "20" }, { "emc_steelwall_2.frames", "1" }, - { "emc_steelwall_3", "RocksDC.pcx" }, - { "emc_steelwall_3.xpos", "14" }, - { "emc_steelwall_3.ypos", "0" }, + { "emc_steelwall_2.scale_up_factor", "2" }, + { "emc_steelwall_3", "emc_object.pcx" }, + { "emc_steelwall_3.xpos", "25" }, + { "emc_steelwall_3.ypos", "21" }, { "emc_steelwall_3.frames", "1" }, - { "emc_steelwall_4", "RocksDC.pcx" }, - { "emc_steelwall_4.xpos", "14" }, - { "emc_steelwall_4.ypos", "0" }, + { "emc_steelwall_3.scale_up_factor", "2" }, + { "emc_steelwall_4", "emc_object.pcx" }, + { "emc_steelwall_4.xpos", "25" }, + { "emc_steelwall_4.ypos", "22" }, { "emc_steelwall_4.frames", "1" }, + { "emc_steelwall_4.scale_up_factor", "2" }, { "emc_wall_1", "RocksDC.pcx" }, { "emc_wall_1.xpos", "13" }, @@ -1382,10 +1443,11 @@ struct ConfigInfo image_config[] = { "emc_wall_7.xpos", "15" }, { "emc_wall_7.ypos", "2" }, { "emc_wall_7.frames", "1" }, - { "emc_wall_8", "RocksDC.pcx" }, - { "emc_wall_8.xpos", "14" }, - { "emc_wall_8.ypos", "1" }, + { "emc_wall_8", "emc_object.pcx" }, + { "emc_wall_8.xpos", "25" }, + { "emc_wall_8.ypos", "31" }, { "emc_wall_8.frames", "1" }, + { "emc_wall_8.scale_up_factor", "2" }, /* images for Diamond Caves style elements and actions */ @@ -3149,6 +3211,194 @@ struct ConfigInfo image_config[] = { "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" }, + + { "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_grass", "emc_object.pcx" }, + { "emc_grass.xpos", "20" }, + { "emc_grass.ypos", "5" }, + { "emc_grass.frames", "1" }, + { "emc_grass.scale_up_factor", "2" }, + + { "emc_magic_ball", "emc_object.pcx" }, + { "emc_magic_ball.xpos", "22" }, + { "emc_magic_ball.ypos", "18" }, + { "emc_magic_ball.frames", "1" }, + { "emc_magic_ball.scale_up_factor", "2" }, + + { "emc_magic_ball_switch", "emc_object.pcx" }, + { "emc_magic_ball_switch.xpos", "25" }, + { "emc_magic_ball_switch.ypos", "10" }, + { "emc_magic_ball_switch.frames", "1" }, + { "emc_magic_ball_switch.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" }, + + { "emc_bumper", "emc_object.pcx" }, + { "emc_bumper.xpos", "25" }, + { "emc_bumper.ypos", "3" }, + { "emc_bumper.frames", "1" }, + { "emc_bumper.scale_up_factor", "2" }, + + { "emc_plant", "emc_object.pcx" }, + { "emc_plant.xpos", "25" }, + { "emc_plant.ypos", "12" }, + { "emc_plant.frames", "1" }, + { "emc_plant.scale_up_factor", "2" }, + + { "emc_lenses", "emc_object.pcx" }, + { "emc_lenses.xpos", "25" }, + { "emc_lenses.ypos", "13" }, + { "emc_lenses.frames", "1" }, + { "emc_lenses.scale_up_factor", "2" }, + + { "emc_magnifier", "emc_object.pcx" }, + { "emc_magnifier.xpos", "25" }, + { "emc_magnifier.ypos", "14" }, + { "emc_magnifier.frames", "1" }, + { "emc_magnifier.scale_up_factor", "2" }, + + { "emc_wall_9", "emc_object.pcx" }, + { "emc_wall_9.xpos", "26" }, + { "emc_wall_9.ypos", "4" }, + { "emc_wall_9.frames", "1" }, + { "emc_wall_9.scale_up_factor", "2" }, + { "emc_wall_10", "emc_object.pcx" }, + { "emc_wall_10.xpos", "26" }, + { "emc_wall_10.ypos", "5" }, + { "emc_wall_10.frames", "1" }, + { "emc_wall_10.scale_up_factor", "2" }, + { "emc_wall_11", "emc_object.pcx" }, + { "emc_wall_11.xpos", "26" }, + { "emc_wall_11.ypos", "9" }, + { "emc_wall_11.frames", "1" }, + { "emc_wall_11.scale_up_factor", "2" }, + { "emc_wall_12", "emc_object.pcx" }, + { "emc_wall_12.xpos", "26" }, + { "emc_wall_12.ypos", "10" }, + { "emc_wall_12.frames", "1" }, + { "emc_wall_12.scale_up_factor", "2" }, + { "emc_wall_13", "emc_object.pcx" }, + { "emc_wall_13.xpos", "25" }, + { "emc_wall_13.ypos", "23" }, + { "emc_wall_13.frames", "1" }, + { "emc_wall_13.scale_up_factor", "2" }, + { "emc_wall_14", "emc_object.pcx" }, + { "emc_wall_14.xpos", "25" }, + { "emc_wall_14.ypos", "24" }, + { "emc_wall_14.frames", "1" }, + { "emc_wall_14.scale_up_factor", "2" }, + { "emc_wall_15", "emc_object.pcx" }, + { "emc_wall_15.xpos", "25" }, + { "emc_wall_15.ypos", "25" }, + { "emc_wall_15.frames", "1" }, + { "emc_wall_15.scale_up_factor", "2" }, + { "emc_wall_16", "emc_object.pcx" }, + { "emc_wall_16.xpos", "25" }, + { "emc_wall_16.ypos", "26" }, + { "emc_wall_16.frames", "1" }, + { "emc_wall_16.scale_up_factor", "2" }, + + { "emc_wall_slippery_1", "emc_object.pcx" }, + { "emc_wall_slippery_1.xpos", "25" }, + { "emc_wall_slippery_1.ypos", "27" }, + { "emc_wall_slippery_1.frames", "1" }, + { "emc_wall_slippery_1.scale_up_factor", "2" }, + { "emc_wall_slippery_2", "emc_object.pcx" }, + { "emc_wall_slippery_2.xpos", "25" }, + { "emc_wall_slippery_2.ypos", "28" }, + { "emc_wall_slippery_2.frames", "1" }, + { "emc_wall_slippery_2.scale_up_factor", "2" }, + { "emc_wall_slippery_3", "emc_object.pcx" }, + { "emc_wall_slippery_3.xpos", "25" }, + { "emc_wall_slippery_3.ypos", "29" }, + { "emc_wall_slippery_3.frames", "1" }, + { "emc_wall_slippery_3.scale_up_factor", "2" }, + { "emc_wall_slippery_4", "emc_object.pcx" }, + { "emc_wall_slippery_4.xpos", "25" }, + { "emc_wall_slippery_4.ypos", "30" }, + { "emc_wall_slippery_4.frames", "1" }, + { "emc_wall_slippery_4.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 */ @@ -3156,6 +3406,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" }, @@ -3697,6 +3955,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 },