X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=44bccba5b511600f40fc9e5ab49f7233a796ddf2;hb=445f1cdcd097f1ede6f6224c1aeef91c7f8eae81;hp=f31a73f11a6a76a5b007ee3c7d204fd984f7fad9;hpb=d8e3568accbc475855027f7199e55543dc4d1ddf;p=rocksndiamonds.git diff --git a/src/conf_gfx.c b/src/conf_gfx.c index f31a73f1..44bccba5 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -59,6 +59,7 @@ struct ConfigTypeInfo image_config_suffix[] = { ".post_delay_random", ARG_UNDEFINED, TYPE_INTEGER }, { ".name", ARG_UNDEFINED, TYPE_STRING }, { ".scale_up_factor", ARG_UNDEFINED, TYPE_INTEGER }, + { ".clone_from", ARG_UNDEFINED, TYPE_TOKEN }, { NULL, NULL, 0 } }; @@ -178,15 +179,43 @@ struct ConfigInfo image_config[] = { "bd_butterfly.anim_mode", "pingpong" }, { "bd_butterfly.delay", "4" }, { "bd_butterfly.global_sync", "true" }, + { "bd_butterfly.right", "RocksElements.pcx" }, + { "bd_butterfly.right.xpos", "4" }, + { "bd_butterfly.right.ypos", "12" }, + { "bd_butterfly.right.frames", "2" }, + { "bd_butterfly.right.anim_mode", "pingpong" }, + { "bd_butterfly.right.delay", "4" }, + { "bd_butterfly.right.global_sync", "true" }, { "bd_butterfly.right.EDITOR", "RocksElements.pcx" }, { "bd_butterfly.right.EDITOR.xpos", "8" }, { "bd_butterfly.right.EDITOR.ypos", "12" }, + { "bd_butterfly.up", "RocksElements.pcx" }, + { "bd_butterfly.up.xpos", "4" }, + { "bd_butterfly.up.ypos", "12" }, + { "bd_butterfly.up.frames", "2" }, + { "bd_butterfly.up.anim_mode", "pingpong" }, + { "bd_butterfly.up.delay", "4" }, + { "bd_butterfly.up.global_sync", "true" }, { "bd_butterfly.up.EDITOR", "RocksElements.pcx" }, { "bd_butterfly.up.EDITOR.xpos", "9" }, { "bd_butterfly.up.EDITOR.ypos", "12" }, + { "bd_butterfly.left", "RocksElements.pcx" }, + { "bd_butterfly.left.xpos", "4" }, + { "bd_butterfly.left.ypos", "12" }, + { "bd_butterfly.left.frames", "2" }, + { "bd_butterfly.left.anim_mode", "pingpong" }, + { "bd_butterfly.left.delay", "4" }, + { "bd_butterfly.left.global_sync", "true" }, { "bd_butterfly.left.EDITOR", "RocksElements.pcx" }, { "bd_butterfly.left.EDITOR.xpos", "10" }, { "bd_butterfly.left.EDITOR.ypos", "12" }, + { "bd_butterfly.down", "RocksElements.pcx" }, + { "bd_butterfly.down.xpos", "4" }, + { "bd_butterfly.down.ypos", "12" }, + { "bd_butterfly.down.frames", "2" }, + { "bd_butterfly.down.anim_mode", "pingpong" }, + { "bd_butterfly.down.delay", "4" }, + { "bd_butterfly.down.global_sync", "true" }, { "bd_butterfly.down.EDITOR", "RocksElements.pcx" }, { "bd_butterfly.down.EDITOR.xpos", "11" }, { "bd_butterfly.down.EDITOR.ypos", "12" }, @@ -198,15 +227,43 @@ struct ConfigInfo image_config[] = { "bd_firefly.anim_mode", "pingpong" }, { "bd_firefly.delay", "4" }, { "bd_firefly.global_sync", "true" }, + { "bd_firefly.right", "RocksElements.pcx" }, + { "bd_firefly.right.xpos", "6" }, + { "bd_firefly.right.ypos", "12" }, + { "bd_firefly.right.frames", "2" }, + { "bd_firefly.right.anim_mode", "pingpong" }, + { "bd_firefly.right.delay", "4" }, + { "bd_firefly.right.global_sync", "true" }, { "bd_firefly.right.EDITOR", "RocksElements.pcx" }, { "bd_firefly.right.EDITOR.xpos", "12" }, { "bd_firefly.right.EDITOR.ypos", "12" }, + { "bd_firefly.up", "RocksElements.pcx" }, + { "bd_firefly.up.xpos", "6" }, + { "bd_firefly.up.ypos", "12" }, + { "bd_firefly.up.frames", "2" }, + { "bd_firefly.up.anim_mode", "pingpong" }, + { "bd_firefly.up.delay", "4" }, + { "bd_firefly.up.global_sync", "true" }, { "bd_firefly.up.EDITOR", "RocksElements.pcx" }, { "bd_firefly.up.EDITOR.xpos", "13" }, { "bd_firefly.up.EDITOR.ypos", "12" }, + { "bd_firefly.left", "RocksElements.pcx" }, + { "bd_firefly.left.xpos", "6" }, + { "bd_firefly.left.ypos", "12" }, + { "bd_firefly.left.frames", "2" }, + { "bd_firefly.left.anim_mode", "pingpong" }, + { "bd_firefly.left.delay", "4" }, + { "bd_firefly.left.global_sync", "true" }, { "bd_firefly.left.EDITOR", "RocksElements.pcx" }, { "bd_firefly.left.EDITOR.xpos", "14" }, { "bd_firefly.left.EDITOR.ypos", "12" }, + { "bd_firefly.down", "RocksElements.pcx" }, + { "bd_firefly.down.xpos", "6" }, + { "bd_firefly.down.ypos", "12" }, + { "bd_firefly.down.frames", "2" }, + { "bd_firefly.down.anim_mode", "pingpong" }, + { "bd_firefly.down.delay", "4" }, + { "bd_firefly.down.global_sync", "true" }, { "bd_firefly.down.EDITOR", "RocksElements.pcx" }, { "bd_firefly.down.EDITOR.xpos", "15" }, { "bd_firefly.down.EDITOR.ypos", "12" }, @@ -1409,21 +1466,18 @@ struct ConfigInfo image_config[] = { "emc_steelwall_1.xpos", "14" }, { "emc_steelwall_1.ypos", "0" }, { "emc_steelwall_1.frames", "1" }, - { "emc_steelwall_2", "emc_object.pcx" }, - { "emc_steelwall_2.xpos", "25" }, - { "emc_steelwall_2.ypos", "20" }, + { "emc_steelwall_2", "RocksEMC.pcx" }, + { "emc_steelwall_2.xpos", "9" }, + { "emc_steelwall_2.ypos", "8" }, { "emc_steelwall_2.frames", "1" }, - { "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", "RocksEMC.pcx" }, + { "emc_steelwall_3.xpos", "9" }, + { "emc_steelwall_3.ypos", "9" }, { "emc_steelwall_3.frames", "1" }, - { "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", "RocksEMC.pcx" }, + { "emc_steelwall_4.xpos", "9" }, + { "emc_steelwall_4.ypos", "10" }, { "emc_steelwall_4.frames", "1" }, - { "emc_steelwall_4.scale_up_factor", "2" }, { "emc_wall_1", "RocksDC.pcx" }, { "emc_wall_1.xpos", "13" }, @@ -1453,11 +1507,10 @@ struct ConfigInfo image_config[] = { "emc_wall_7.xpos", "15" }, { "emc_wall_7.ypos", "2" }, { "emc_wall_7.frames", "1" }, - { "emc_wall_8", "emc_object.pcx" }, - { "emc_wall_8.xpos", "25" }, - { "emc_wall_8.ypos", "31" }, + { "emc_wall_8", "RocksEMC.pcx" }, + { "emc_wall_8.xpos", "8" }, + { "emc_wall_8.ypos", "7" }, { "emc_wall_8.frames", "1" }, - { "emc_wall_8.scale_up_factor", "2" }, /* images for Diamond Caves style elements and actions */ @@ -3283,78 +3336,72 @@ struct ConfigInfo image_config[] = { "trigger_player.ypos", "13" }, { "trigger_player.frames", "1" }, - { "em_key_5", "RocksEMC.pcx" }, - { "em_key_5.xpos", "0" }, - { "em_key_5.ypos", "5" }, - { "em_key_5.frames", "1" }, - { "em_key_6", "RocksEMC.pcx" }, - { "em_key_6.xpos", "1" }, - { "em_key_6.ypos", "5" }, - { "em_key_6.frames", "1" }, - { "em_key_7", "RocksEMC.pcx" }, - { "em_key_7.xpos", "2" }, - { "em_key_7.ypos", "5" }, - { "em_key_7.frames", "1" }, - { "em_key_8", "RocksEMC.pcx" }, - { "em_key_8.xpos", "3" }, - { "em_key_8.ypos", "5" }, - { "em_key_8.frames", "1" }, - - { "em_gate_5", "RocksEMC.pcx" }, - { "em_gate_5.xpos", "0" }, - { "em_gate_5.ypos", "6" }, - { "em_gate_5.frames", "1" }, - { "em_gate_5_gray", "RocksEMC.pcx" }, - { "em_gate_5_gray.xpos", "4" }, - { "em_gate_5_gray.ypos", "7" }, - { "em_gate_5_gray.frames", "1" }, - { "em_gate_5_gray.EDITOR", "RocksEMC.pcx" }, - { "em_gate_5_gray.EDITOR.xpos", "0" }, - { "em_gate_5_gray.EDITOR.ypos", "7" }, - { "em_gate_5_gray.EDITOR.frames", "1" }, - { "em_gate_6", "RocksEMC.pcx" }, - { "em_gate_6.xpos", "1" }, - { "em_gate_6.ypos", "6" }, - { "em_gate_6.frames", "1" }, - { "em_gate_6_gray", "RocksEMC.pcx" }, - { "em_gate_6_gray.xpos", "4" }, - { "em_gate_6_gray.ypos", "7" }, - { "em_gate_6_gray.frames", "1" }, - { "em_gate_6_gray.EDITOR", "RocksEMC.pcx" }, - { "em_gate_6_gray.EDITOR.xpos", "1" }, - { "em_gate_6_gray.EDITOR.ypos", "7" }, - { "em_gate_6_gray.EDITOR.frames", "1" }, - { "em_gate_7", "RocksEMC.pcx" }, - { "em_gate_7.xpos", "2" }, - { "em_gate_7.ypos", "6" }, - { "em_gate_7.frames", "1" }, - { "em_gate_7_gray", "RocksEMC.pcx" }, - { "em_gate_7_gray.xpos", "4" }, - { "em_gate_7_gray.ypos", "7" }, - { "em_gate_7_gray.frames", "1" }, - { "em_gate_7_gray.EDITOR", "RocksEMC.pcx" }, - { "em_gate_7_gray.EDITOR.xpos", "2" }, - { "em_gate_7_gray.EDITOR.ypos", "7" }, - { "em_gate_7_gray.EDITOR.frames", "1" }, - { "em_gate_8", "RocksEMC.pcx" }, - { "em_gate_8.xpos", "3" }, - { "em_gate_8.ypos", "6" }, - { "em_gate_8.frames", "1" }, - { "em_gate_8_gray", "RocksEMC.pcx" }, - { "em_gate_8_gray.xpos", "4" }, - { "em_gate_8_gray.ypos", "7" }, - { "em_gate_8_gray.frames", "1" }, - { "em_gate_8_gray.EDITOR", "RocksEMC.pcx" }, - { "em_gate_8_gray.EDITOR.xpos", "3" }, - { "em_gate_8_gray.EDITOR.ypos", "7" }, - { "em_gate_8_gray.EDITOR.frames", "1" }, - - { "emc_android", "emc_object.pcx" }, - { "emc_android.xpos", "7" }, - { "emc_android.ypos", "13" }, + { "emc_key_5", "RocksEMC.pcx" }, + { "emc_key_5.xpos", "0" }, + { "emc_key_5.ypos", "5" }, + { "emc_key_5.frames", "1" }, + { "emc_key_6", "RocksEMC.pcx" }, + { "emc_key_6.xpos", "1" }, + { "emc_key_6.ypos", "5" }, + { "emc_key_6.frames", "1" }, + { "emc_key_7", "RocksEMC.pcx" }, + { "emc_key_7.xpos", "2" }, + { "emc_key_7.ypos", "5" }, + { "emc_key_7.frames", "1" }, + { "emc_key_8", "RocksEMC.pcx" }, + { "emc_key_8.xpos", "3" }, + { "emc_key_8.ypos", "5" }, + { "emc_key_8.frames", "1" }, + + { "emc_gate_5", "RocksEMC.pcx" }, + { "emc_gate_5.xpos", "0" }, + { "emc_gate_5.ypos", "6" }, + { "emc_gate_5.frames", "1" }, + { "emc_gate_5_gray", "RocksEMC.pcx" }, + { "emc_gate_5_gray.xpos", "4" }, + { "emc_gate_5_gray.ypos", "7" }, + { "emc_gate_5_gray.frames", "1" }, + { "emc_gate_5_gray.EDITOR", "RocksEMC.pcx" }, + { "emc_gate_5_gray.EDITOR.xpos", "0" }, + { "emc_gate_5_gray.EDITOR.ypos", "7" }, + { "emc_gate_6", "RocksEMC.pcx" }, + { "emc_gate_6.xpos", "1" }, + { "emc_gate_6.ypos", "6" }, + { "emc_gate_6.frames", "1" }, + { "emc_gate_6_gray", "RocksEMC.pcx" }, + { "emc_gate_6_gray.xpos", "4" }, + { "emc_gate_6_gray.ypos", "7" }, + { "emc_gate_6_gray.frames", "1" }, + { "emc_gate_6_gray.EDITOR", "RocksEMC.pcx" }, + { "emc_gate_6_gray.EDITOR.xpos", "1" }, + { "emc_gate_6_gray.EDITOR.ypos", "7" }, + { "emc_gate_7", "RocksEMC.pcx" }, + { "emc_gate_7.xpos", "2" }, + { "emc_gate_7.ypos", "6" }, + { "emc_gate_7.frames", "1" }, + { "emc_gate_7_gray", "RocksEMC.pcx" }, + { "emc_gate_7_gray.xpos", "4" }, + { "emc_gate_7_gray.ypos", "7" }, + { "emc_gate_7_gray.frames", "1" }, + { "emc_gate_7_gray.EDITOR", "RocksEMC.pcx" }, + { "emc_gate_7_gray.EDITOR.xpos", "2" }, + { "emc_gate_7_gray.EDITOR.ypos", "7" }, + { "emc_gate_8", "RocksEMC.pcx" }, + { "emc_gate_8.xpos", "3" }, + { "emc_gate_8.ypos", "6" }, + { "emc_gate_8.frames", "1" }, + { "emc_gate_8_gray", "RocksEMC.pcx" }, + { "emc_gate_8_gray.xpos", "4" }, + { "emc_gate_8_gray.ypos", "7" }, + { "emc_gate_8_gray.frames", "1" }, + { "emc_gate_8_gray.EDITOR", "RocksEMC.pcx" }, + { "emc_gate_8_gray.EDITOR.xpos", "3" }, + { "emc_gate_8_gray.EDITOR.ypos", "7" }, + + { "emc_android", "RocksEMC.pcx" }, + { "emc_android.xpos", "0" }, + { "emc_android.ypos", "8" }, { "emc_android.frames", "8" }, - { "emc_android.vertical", "true" }, - { "emc_android.scale_up_factor", "2" }, { "emc_grass", "RocksEMC.pcx" }, { "emc_grass.xpos", "0" }, @@ -3413,30 +3460,26 @@ struct ConfigInfo image_config[] = { "emc_grass.digging.down.CRUMBLED.delay", "2" }, { "emc_grass.digging.down.CRUMBLED.anim_mode","linear" }, - { "emc_magic_ball", "emc_object.pcx" }, - { "emc_magic_ball.xpos", "22" }, - { "emc_magic_ball.ypos", "18" }, + { "emc_magic_ball", "RocksEMC.pcx" }, + { "emc_magic_ball.xpos", "0" }, + { "emc_magic_ball.ypos", "9" }, { "emc_magic_ball.frames", "1" }, - { "emc_magic_ball.scale_up_factor", "2" }, - { "emc_magic_ball.active", "emc_object.pcx" }, - { "emc_magic_ball.active.xpos", "22" }, - { "emc_magic_ball.active.ypos", "18" }, + { "emc_magic_ball.active", "RocksEMC.pcx" }, + { "emc_magic_ball.active.xpos", "0" }, + { "emc_magic_ball.active.ypos", "9" }, { "emc_magic_ball.active.frames", "16" }, - { "emc_magic_ball.active.vertical", "true" }, - { "emc_magic_ball.active.scale_up_factor", "2" }, + { "emc_magic_ball.active.frames_per_line", "8" }, - { "emc_magic_ball_switch", "emc_object.pcx" }, - { "emc_magic_ball_switch.xpos", "25" }, + { "emc_magic_ball_switch", "RocksEMC.pcx" }, + { "emc_magic_ball_switch.xpos", "8" }, { "emc_magic_ball_switch.ypos", "10" }, { "emc_magic_ball_switch.frames", "1" }, - { "emc_magic_ball_switch.scale_up_factor", "2" }, - { "emc_magic_ball_switch.active", "emc_object.pcx" }, - { "emc_magic_ball_switch.active.xpos", "25" }, + { "emc_magic_ball_switch.active", "RocksEMC.pcx" }, + { "emc_magic_ball_switch.active.xpos", "8" }, { "emc_magic_ball_switch.active.ypos", "9" }, { "emc_magic_ball_switch.active.frames", "1" }, - { "emc_magic_ball_switch.active.scale_up_factor", "2" }, { "emc_spring_bumper", "RocksEMC.pcx" }, { "emc_spring_bumper.xpos", "8" }, @@ -3468,67 +3511,55 @@ struct ConfigInfo image_config[] = { "emc_magnifier.ypos", "4" }, { "emc_magnifier.frames", "1" }, - { "emc_wall_9", "emc_object.pcx" }, - { "emc_wall_9.xpos", "26" }, - { "emc_wall_9.ypos", "4" }, + { "emc_wall_9", "RocksEMC.pcx" }, + { "emc_wall_9.xpos", "10" }, + { "emc_wall_9.ypos", "5" }, { "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", "RocksEMC.pcx" }, + { "emc_wall_10.xpos", "10" }, + { "emc_wall_10.ypos", "6" }, { "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", "RocksEMC.pcx" }, + { "emc_wall_11.xpos", "11" }, + { "emc_wall_11.ypos", "5" }, { "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", "RocksEMC.pcx" }, + { "emc_wall_12.xpos", "11" }, + { "emc_wall_12.ypos", "6" }, { "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", "RocksEMC.pcx" }, + { "emc_wall_13.xpos", "10" }, + { "emc_wall_13.ypos", "7" }, { "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", "RocksEMC.pcx" }, + { "emc_wall_14.xpos", "10" }, + { "emc_wall_14.ypos", "8" }, { "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", "RocksEMC.pcx" }, + { "emc_wall_15.xpos", "10" }, + { "emc_wall_15.ypos", "9" }, { "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", "RocksEMC.pcx" }, + { "emc_wall_16.xpos", "10" }, + { "emc_wall_16.ypos", "10" }, { "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", "RocksEMC.pcx" }, + { "emc_wall_slippery_1.xpos", "11" }, + { "emc_wall_slippery_1.ypos", "7" }, { "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", "RocksEMC.pcx" }, + { "emc_wall_slippery_2.xpos", "11" }, + { "emc_wall_slippery_2.ypos", "8" }, { "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", "RocksEMC.pcx" }, + { "emc_wall_slippery_3.xpos", "11" }, + { "emc_wall_slippery_3.ypos", "9" }, { "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", "RocksEMC.pcx" }, + { "emc_wall_slippery_4.xpos", "11" }, + { "emc_wall_slippery_4.ypos", "10" }, { "emc_wall_slippery_4.frames", "1" }, - { "emc_wall_slippery_4.scale_up_factor", "2" }, { "emc_fake_grass", "RocksEMC.pcx" }, { "emc_fake_grass.xpos", "0" }, @@ -3547,20 +3578,24 @@ struct ConfigInfo image_config[] = { "emc_fake_grass.active.CRUMBLED.ypos", "4" }, { "emc_fake_grass.active.CRUMBLED.frames", "1" }, + { "emc_fake_acid", "RocksElements.pcx" }, + { "emc_fake_acid.xpos", "12" }, + { "emc_fake_acid.ypos", "7" }, + { "emc_fake_acid.frames", "4" }, + { "emc_fake_acid.delay", "10" }, + { "emc_fake_acid.global_sync", "true" }, + { "emc_dripper", "RocksSP.pcx" }, { "emc_dripper.xpos", "0" }, { "emc_dripper.ypos", "0" }, { "emc_dripper.frames", "1" }, - { "emc_dripper.EDITOR", "emc_object.pcx" }, - { "emc_dripper.EDITOR.xpos", "25" }, - { "emc_dripper.EDITOR.ypos", "15" }, - { "emc_dripper.EDITOR.frames", "1" }, - { "emc_dripper.EDITOR.scale_up_factor", "2" }, - { "emc_dripper.active", "emc_object.pcx" }, - { "emc_dripper.active.xpos", "25" }, - { "emc_dripper.active.ypos", "15" }, + { "emc_dripper.EDITOR", "RocksEMC.pcx" }, + { "emc_dripper.EDITOR.xpos", "8" }, + { "emc_dripper.EDITOR.ypos", "8" }, + { "emc_dripper.active", "RocksEMC.pcx" }, + { "emc_dripper.active.xpos", "8" }, + { "emc_dripper.active.ypos", "8" }, { "emc_dripper.active.frames", "1" }, - { "emc_dripper.active.scale_up_factor", "2" }, #include "conf_chr.c" /* include auto-generated data structure definitions */ #include "conf_cus.c" /* include auto-generated data structure definitions */ @@ -3569,13 +3604,21 @@ 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! */ +#if 1 /* !!! TEMPORARILY STORED HERE -- PROBABLY TO BE CHANGED !!! */ - { "emc_object", "emc_object.pcx" }, + /* (for testing, change filename back to "emc_object dot pcx") */ + { "emc_object", "RocksEMC.pcx" }, +#if 0 { "emc_object.scale_up_factor", "2" }, +#endif - { "emc_sprite", "emc_sprite.pcx" }, + /* (for testing, change filename back to "emc_sprite dot pcx") */ + { "emc_sprite", "RocksEMC.pcx" }, +#if 0 { "emc_sprite.scale_up_factor", "2" }, +#endif +#endif { "toon_1", "RocksToons.pcx" }, { "toon_1.x", "2" }, @@ -3789,35 +3832,57 @@ struct ConfigInfo image_config[] = { "menu.button_left.xpos", "8" }, { "menu.button_left.ypos", "8" }, { "menu.button_left.frames", "1" }, - { "menu.button_right", "RocksDC.pcx" }, - { "menu.button_right.xpos", "9" }, - { "menu.button_right.ypos", "8" }, - { "menu.button_right.frames", "1" }, - { "menu.button_up", "RocksDC.pcx" }, - { "menu.button_up.xpos", "10" }, - { "menu.button_up.ypos", "8" }, - { "menu.button_up.frames", "1" }, - { "menu.button_down", "RocksDC.pcx" }, - { "menu.button_down.xpos", "11" }, - { "menu.button_down.ypos", "8" }, - { "menu.button_down.frames", "1" }, { "menu.button_left.active", "RocksDC.pcx" }, { "menu.button_left.active.xpos", "8" }, { "menu.button_left.active.ypos", "9" }, { "menu.button_left.active.frames", "1" }, + { "menu.button_right", "RocksDC.pcx" }, + { "menu.button_right.xpos", "9" }, + { "menu.button_right.ypos", "8" }, + { "menu.button_right.frames", "1" }, { "menu.button_right.active", "RocksDC.pcx" }, { "menu.button_right.active.xpos", "9" }, { "menu.button_right.active.ypos", "9" }, { "menu.button_right.active.frames", "1" }, + { "menu.button_up", "RocksDC.pcx" }, + { "menu.button_up.xpos", "10" }, + { "menu.button_up.ypos", "8" }, + { "menu.button_up.frames", "1" }, { "menu.button_up.active", "RocksDC.pcx" }, { "menu.button_up.active.xpos", "10" }, { "menu.button_up.active.ypos", "9" }, { "menu.button_up.active.frames", "1" }, + { "menu.button_down", "RocksDC.pcx" }, + { "menu.button_down.xpos", "11" }, + { "menu.button_down.ypos", "8" }, + { "menu.button_down.frames", "1" }, { "menu.button_down.active", "RocksDC.pcx" }, { "menu.button_down.active.xpos", "11" }, { "menu.button_down.active.ypos", "9" }, { "menu.button_down.active.frames", "1" }, + { "menu.button_enter_menu2", "RocksDC.pcx" }, + { "menu.button_enter_menu2.xpos", "9" }, + { "menu.button_enter_menu2.ypos", "8" }, + { "menu.button_enter_menu2.frames", "1" }, + { "menu.button_enter_menu2.active", "RocksDC.pcx" }, + { "menu.button_enter_menu2.active.xpos", "9" }, + { "menu.button_enter_menu2.active.ypos", "9" }, + { "menu.button_enter_menu2.active.frames", "1" }, + { "menu.button_leave_menu", "RocksDC.pcx" }, + { "menu.button_leave_menu.xpos", "8" }, + { "menu.button_leave_menu.ypos", "8" }, + { "menu.button_leave_menu.frames", "1" }, + { "menu.button_leave_menu.active", "RocksDC.pcx" }, + { "menu.button_leave_menu.active.xpos", "8" }, + { "menu.button_leave_menu.active.ypos", "9" }, + { "menu.button_leave_menu.active.frames", "1" }, + + { "menu.button_enter_menu", UNDEFINED_FILENAME }, + { "menu.button_enter_menu.clone_from", "menu.button_right" }, + { "menu.button_enter_menu.active", UNDEFINED_FILENAME }, + { "menu.button_enter_menu.active.clone_from", "menu.button_right.active"}, + { "menu.scrollbar", "RocksDC.pcx" }, { "menu.scrollbar.xpos", "8" }, { "menu.scrollbar.ypos", "10" }, @@ -4119,6 +4184,10 @@ struct ConfigInfo image_config[] = { "background.EDITOR", UNDEFINED_FILENAME }, { "background.INFO", UNDEFINED_FILENAME }, { "background.INFO[ELEMENTS]", UNDEFINED_FILENAME }, + { "background.INFO[MUSIC]", UNDEFINED_FILENAME }, + { "background.INFO[CREDITS]", UNDEFINED_FILENAME }, + { "background.INFO[PROGRAM]", UNDEFINED_FILENAME }, + { "background.INFO[LEVELSET]", UNDEFINED_FILENAME }, { "background.SETUP", UNDEFINED_FILENAME }, { "background.DOOR", UNDEFINED_FILENAME },