X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=52f0f135d05056f9950bc85de8255bac0cbe8430;hb=c5d03f36989babf47697957101ecebe9b7b9cbe8;hp=66b5af444299a28c640883abb84fff5083e4e49d;hpb=9b360b977c0c1988c9a9bd63bb6d3f3991d1a650;p=rocksndiamonds.git diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 66b5af44..52f0f135 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 } }; @@ -1368,6 +1369,10 @@ struct ConfigInfo image_config[] = { "em_gate_1_gray.EDITOR", "RocksSP.pcx" }, { "em_gate_1_gray.EDITOR.xpos", "12" }, { "em_gate_1_gray.EDITOR.ypos", "11" }, + { "em_gate_1_gray.active", "RocksSP.pcx" }, + { "em_gate_1_gray.active.xpos", "0" }, + { "em_gate_1_gray.active.ypos", "7" }, + { "em_gate_1_gray.active.frames", "1" }, { "em_gate_2_gray", "RocksSP.pcx" }, { "em_gate_2_gray.xpos", "5" }, { "em_gate_2_gray.ypos", "7" }, @@ -1375,6 +1380,10 @@ struct ConfigInfo image_config[] = { "em_gate_2_gray.EDITOR", "RocksSP.pcx" }, { "em_gate_2_gray.EDITOR.xpos", "13" }, { "em_gate_2_gray.EDITOR.ypos", "11" }, + { "em_gate_2_gray.active", "RocksSP.pcx" }, + { "em_gate_2_gray.active.xpos", "1" }, + { "em_gate_2_gray.active.ypos", "7" }, + { "em_gate_2_gray.active.frames", "1" }, { "em_gate_3_gray", "RocksSP.pcx" }, { "em_gate_3_gray.xpos", "6" }, { "em_gate_3_gray.ypos", "7" }, @@ -1382,6 +1391,10 @@ struct ConfigInfo image_config[] = { "em_gate_3_gray.EDITOR", "RocksSP.pcx" }, { "em_gate_3_gray.EDITOR.xpos", "14" }, { "em_gate_3_gray.EDITOR.ypos", "11" }, + { "em_gate_3_gray.active", "RocksSP.pcx" }, + { "em_gate_3_gray.active.xpos", "2" }, + { "em_gate_3_gray.active.ypos", "7" }, + { "em_gate_3_gray.active.frames", "1" }, { "em_gate_4_gray", "RocksSP.pcx" }, { "em_gate_4_gray.xpos", "7" }, { "em_gate_4_gray.ypos", "7" }, @@ -1389,6 +1402,10 @@ struct ConfigInfo image_config[] = { "em_gate_4_gray.EDITOR", "RocksSP.pcx" }, { "em_gate_4_gray.EDITOR.xpos", "15" }, { "em_gate_4_gray.EDITOR.ypos", "11" }, + { "em_gate_4_gray.active", "RocksSP.pcx" }, + { "em_gate_4_gray.active.xpos", "3" }, + { "em_gate_4_gray.active.ypos", "7" }, + { "em_gate_4_gray.active.frames", "1" }, { "exit_closed", "RocksElements.pcx" }, { "exit_closed.xpos", "0" }, @@ -2076,6 +2093,10 @@ struct ConfigInfo image_config[] = { "gate_1_gray.EDITOR", "RocksElements.pcx" }, { "gate_1_gray.EDITOR.xpos", "8" }, { "gate_1_gray.EDITOR.ypos", "14" }, + { "gate_1_gray.active", "RocksElements.pcx" }, + { "gate_1_gray.active.xpos", "4" }, + { "gate_1_gray.active.ypos", "2" }, + { "gate_1_gray.active.frames", "1" }, { "gate_2_gray", "RocksElements.pcx" }, { "gate_2_gray.xpos", "9" }, { "gate_2_gray.ypos", "2" }, @@ -2083,6 +2104,10 @@ struct ConfigInfo image_config[] = { "gate_2_gray.EDITOR", "RocksElements.pcx" }, { "gate_2_gray.EDITOR.xpos", "9" }, { "gate_2_gray.EDITOR.ypos", "14" }, + { "gate_2_gray.active", "RocksElements.pcx" }, + { "gate_2_gray.active.xpos", "5" }, + { "gate_2_gray.active.ypos", "2" }, + { "gate_2_gray.active.frames", "1" }, { "gate_3_gray", "RocksElements.pcx" }, { "gate_3_gray.xpos", "10" }, { "gate_3_gray.ypos", "2" }, @@ -2090,6 +2115,10 @@ struct ConfigInfo image_config[] = { "gate_3_gray.EDITOR", "RocksElements.pcx" }, { "gate_3_gray.EDITOR.xpos", "10" }, { "gate_3_gray.EDITOR.ypos", "14" }, + { "gate_3_gray.active", "RocksElements.pcx" }, + { "gate_3_gray.active.xpos", "6" }, + { "gate_3_gray.active.ypos", "2" }, + { "gate_3_gray.active.frames", "1" }, { "gate_4_gray", "RocksElements.pcx" }, { "gate_4_gray.xpos", "11" }, { "gate_4_gray.ypos", "2" }, @@ -2097,6 +2126,10 @@ struct ConfigInfo image_config[] = { "gate_4_gray.EDITOR", "RocksElements.pcx" }, { "gate_4_gray.EDITOR.xpos", "11" }, { "gate_4_gray.EDITOR.ypos", "14" }, + { "gate_4_gray.active", "RocksElements.pcx" }, + { "gate_4_gray.active.xpos", "7" }, + { "gate_4_gray.active.ypos", "2" }, + { "gate_4_gray.active.frames", "1" }, { "game_of_life", "RocksElements.pcx" }, { "game_of_life.xpos", "8" }, @@ -3356,6 +3389,18 @@ struct ConfigInfo image_config[] = { "emc_gate_5.xpos", "0" }, { "emc_gate_5.ypos", "6" }, { "emc_gate_5.frames", "1" }, + { "emc_gate_6", "RocksEMC.pcx" }, + { "emc_gate_6.xpos", "1" }, + { "emc_gate_6.ypos", "6" }, + { "emc_gate_6.frames", "1" }, + { "emc_gate_7", "RocksEMC.pcx" }, + { "emc_gate_7.xpos", "2" }, + { "emc_gate_7.ypos", "6" }, + { "emc_gate_7.frames", "1" }, + { "emc_gate_8", "RocksEMC.pcx" }, + { "emc_gate_8.xpos", "3" }, + { "emc_gate_8.ypos", "6" }, + { "emc_gate_8.frames", "1" }, { "emc_gate_5_gray", "RocksEMC.pcx" }, { "emc_gate_5_gray.xpos", "4" }, { "emc_gate_5_gray.ypos", "7" }, @@ -3363,10 +3408,10 @@ struct ConfigInfo image_config[] = { "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_5_gray.active", "RocksEMC.pcx" }, + { "emc_gate_5_gray.active.xpos", "0" }, + { "emc_gate_5_gray.active.ypos", "6" }, + { "emc_gate_5_gray.active.frames", "1" }, { "emc_gate_6_gray", "RocksEMC.pcx" }, { "emc_gate_6_gray.xpos", "4" }, { "emc_gate_6_gray.ypos", "7" }, @@ -3374,10 +3419,10 @@ struct ConfigInfo image_config[] = { "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_6_gray.active", "RocksEMC.pcx" }, + { "emc_gate_6_gray.active.xpos", "1" }, + { "emc_gate_6_gray.active.ypos", "6" }, + { "emc_gate_6_gray.active.frames", "1" }, { "emc_gate_7_gray", "RocksEMC.pcx" }, { "emc_gate_7_gray.xpos", "4" }, { "emc_gate_7_gray.ypos", "7" }, @@ -3385,10 +3430,10 @@ struct ConfigInfo image_config[] = { "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_7_gray.active", "RocksEMC.pcx" }, + { "emc_gate_7_gray.active.xpos", "2" }, + { "emc_gate_7_gray.active.ypos", "6" }, + { "emc_gate_7_gray.active.frames", "1" }, { "emc_gate_8_gray", "RocksEMC.pcx" }, { "emc_gate_8_gray.xpos", "4" }, { "emc_gate_8_gray.ypos", "7" }, @@ -3396,11 +3441,24 @@ struct ConfigInfo image_config[] = { "emc_gate_8_gray.EDITOR", "RocksEMC.pcx" }, { "emc_gate_8_gray.EDITOR.xpos", "3" }, { "emc_gate_8_gray.EDITOR.ypos", "7" }, + { "emc_gate_8_gray.active", "RocksEMC.pcx" }, + { "emc_gate_8_gray.active.xpos", "3" }, + { "emc_gate_8_gray.active.ypos", "6" }, + { "emc_gate_8_gray.active.frames", "1" }, { "emc_android", "RocksEMC.pcx" }, { "emc_android.xpos", "0" }, { "emc_android.ypos", "8" }, { "emc_android.frames", "8" }, + { "emc_android.delay", "2" }, + { "emc_android.shrinking", "RocksEMC.pcx" }, + { "emc_android.shrinking.xpos", "0" }, + { "emc_android.shrinking.ypos", "8" }, + { "emc_android.shrinking.frames", "1" }, + { "emc_android.growing", "RocksEMC.pcx" }, + { "emc_android.growing.xpos", "0" }, + { "emc_android.growing.ypos", "8" }, + { "emc_android.growing.frames", "1" }, { "emc_grass", "RocksEMC.pcx" }, { "emc_grass.xpos", "0" }, @@ -3463,18 +3521,21 @@ struct ConfigInfo image_config[] = { "emc_magic_ball.xpos", "0" }, { "emc_magic_ball.ypos", "9" }, { "emc_magic_ball.frames", "1" }, - { "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.frames_per_line", "8" }, + { "emc_magic_ball.dropping", "RocksElements.pcx" }, + { "emc_magic_ball.dropping.xpos", "0" }, + { "emc_magic_ball.dropping.ypos", "4" }, + { "emc_magic_ball.dropping.frames", "8" }, + { "emc_magic_ball.dropping.anim_mode", "linear" }, { "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.active", "RocksEMC.pcx" }, { "emc_magic_ball_switch.active.xpos", "8" }, { "emc_magic_ball_switch.active.ypos", "9" }, @@ -3607,13 +3668,13 @@ struct ConfigInfo image_config[] = /* !!! TEMPORARILY STORED HERE -- PROBABLY TO BE CHANGED !!! */ /* (for testing, change filename back to "emc_object dot pcx") */ - { "emc_object", "RocksEMC.pcx" }, + { "emc_object", "emc_object.pcx" }, #if 0 { "emc_object.scale_up_factor", "2" }, #endif /* (for testing, change filename back to "emc_sprite dot pcx") */ - { "emc_sprite", "RocksEMC.pcx" }, + { "emc_sprite", "emc_sprite.pcx" }, #if 0 { "emc_sprite.scale_up_factor", "2" }, #endif @@ -3831,35 +3892,44 @@ 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_menu", "RocksDC.pcx" }, + { "menu.button_enter_menu.clone_from", "menu.button_right" }, + { "menu.button_enter_menu.active", "RocksDC.pcx" }, + { "menu.button_enter_menu.active.clone_from", "menu.button_right.active" }, + { "menu.button_leave_menu", "RocksDC.pcx" }, + { "menu.button_leave_menu.clone_from", "menu.button_left" }, + { "menu.button_leave_menu.active", "RocksDC.pcx" }, + { "menu.button_leave_menu.active.clone_from", "menu.button_left.active" }, + { "menu.scrollbar", "RocksDC.pcx" }, { "menu.scrollbar.xpos", "8" }, { "menu.scrollbar.ypos", "10" }, @@ -3895,11 +3965,6 @@ struct ConfigInfo image_config[] = { "font.title_1.y", "480" }, { "font.title_1.width", "32" }, { "font.title_1.height", "32" }, - { "font.title_1.LEVELS", "RocksFontBig.pcx" }, - { "font.title_1.LEVELS.x", "0" }, - { "font.title_1.LEVELS.y", "320" }, - { "font.title_1.LEVELS.width", "32" }, - { "font.title_1.LEVELS.height", "32" }, { "font.title_2", "RocksFontSmall.pcx" }, { "font.title_2.x", "0" }, { "font.title_2.y", "0" }, @@ -4125,6 +4190,15 @@ struct ConfigInfo image_config[] = { "editor.element_border_input.xpos", "0" }, { "editor.element_border_input.ypos", "0" }, + { "editor.cascade_list", "RocksDoor.pcx" }, + { "editor.cascade_list.x", "708" }, + { "editor.cascade_list.y", "80" }, + { "editor.cascade_list.frames", "1" }, + { "editor.cascade_list.active", "RocksDoor.pcx" }, + { "editor.cascade_list.active.x", "740" }, + { "editor.cascade_list.active.y", "80" }, + { "editor.cascade_list.active.frames", "1" }, + { "background.envelope_1", "RocksScreen.pcx" }, { "background.envelope_1.x", "0" }, { "background.envelope_1.y", "0" }, @@ -4195,9 +4269,14 @@ struct ConfigInfo image_config[] = { "menu.list_size.SCORES", "-1" }, { "menu.list_size.INFO", "-1" }, + { "door_1.width", "-1" }, + { "door_1.height", "-1" }, { "door_1.step_offset", "2" }, { "door_1.step_delay", "10" }, { "door_1.anim_mode", "default" }, + + { "door_2.width", "-1" }, + { "door_2.height", "-1" }, { "door_2.step_offset", "2" }, { "door_2.step_delay", "10" }, { "door_2.anim_mode", "default" },