X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.c;h=23660fbd5f98dc942c7d28d4fb1bb8dd66252991;hp=ccd297a68af2450981075e97d86d70f47fff60a2;hb=cd9add1d9479d1938d05ca9df4f31c3f99bd5f3e;hpb=a84bd00a438ff458c2d74d1d1784deefe12bf84a diff --git a/src/main.c b/src/main.c index ccd297a6..23660fbd 100644 --- a/src/main.c +++ b/src/main.c @@ -601,10 +601,12 @@ struct ConfigInfo image_config[] = { "sp_terminal.xpos", "8" }, { "sp_terminal.ypos", "11" }, { "sp_terminal.frames", "7" }, + { "sp_terminal.delay", "12" }, { "sp_terminal.active", "RocksSP.pcx" }, { "sp_terminal.active.xpos", "8" }, { "sp_terminal.active.ypos", "12" }, { "sp_terminal.active.frames", "7" }, + { "sp_terminal.active.delay", "4" }, { "sp_buggy_base", "RocksSP.pcx" }, { "sp_buggy_base.xpos", "1" }, @@ -1215,6 +1217,7 @@ struct ConfigInfo image_config[] = { "conveyor_belt1_middle.active.xpos", "0" }, { "conveyor_belt1_middle.active.ypos", "0" }, { "conveyor_belt1_middle.active.frames", "8" }, + { "conveyor_belt1_middle.active.delay", "2" }, { "conveyor_belt1_left", "RocksDC.pcx" }, { "conveyor_belt1_left.xpos", "0" }, { "conveyor_belt1_left.ypos", "1" }, @@ -1223,6 +1226,7 @@ struct ConfigInfo image_config[] = { "conveyor_belt1_left.active.xpos", "0" }, { "conveyor_belt1_left.active.ypos", "1" }, { "conveyor_belt1_left.active.frames", "8" }, + { "conveyor_belt1_left.active.delay", "2" }, { "conveyor_belt1_right", "RocksDC.pcx" }, { "conveyor_belt1_right.xpos", "0" }, { "conveyor_belt1_right.ypos", "2" }, @@ -1231,6 +1235,7 @@ struct ConfigInfo image_config[] = { "conveyor_belt1_right.active.xpos", "0" }, { "conveyor_belt1_right.active.ypos", "2" }, { "conveyor_belt1_right.active.frames", "8" }, + { "conveyor_belt1_right.active.delay", "2" }, { "conveyor_belt1_switch_left", "RocksDC.pcx" }, { "conveyor_belt1_switch_left.xpos", "0" }, { "conveyor_belt1_switch_left.ypos", "12" }, @@ -1252,6 +1257,7 @@ struct ConfigInfo image_config[] = { "conveyor_belt2_middle.active.xpos", "0" }, { "conveyor_belt2_middle.active.ypos", "3" }, { "conveyor_belt2_middle.active.frames", "8" }, + { "conveyor_belt2_middle.active.delay", "2" }, { "conveyor_belt2_left", "RocksDC.pcx" }, { "conveyor_belt2_left.xpos", "0" }, { "conveyor_belt2_left.ypos", "4" }, @@ -1260,6 +1266,7 @@ struct ConfigInfo image_config[] = { "conveyor_belt2_left.active.xpos", "0" }, { "conveyor_belt2_left.active.ypos", "4" }, { "conveyor_belt2_left.active.frames", "8" }, + { "conveyor_belt2_left.active.delay", "2" }, { "conveyor_belt2_right", "RocksDC.pcx" }, { "conveyor_belt2_right.xpos", "0" }, { "conveyor_belt2_right.ypos", "5" }, @@ -1268,6 +1275,8 @@ struct ConfigInfo image_config[] = { "conveyor_belt2_right.active.xpos", "0" }, { "conveyor_belt2_right.active.ypos", "5" }, { "conveyor_belt2_right.active.frames", "8" }, + { "conveyor_belt2_right.active.delay", "2" }, + { "conveyor_belt2_right.active.delay", "2" }, { "conveyor_belt2_switch_left", "RocksDC.pcx" }, { "conveyor_belt2_switch_left.xpos", "1" }, { "conveyor_belt2_switch_left.ypos", "12" }, @@ -1289,6 +1298,7 @@ struct ConfigInfo image_config[] = { "conveyor_belt3_middle.active.xpos", "0" }, { "conveyor_belt3_middle.active.ypos", "6" }, { "conveyor_belt3_middle.active.frames", "8" }, + { "conveyor_belt3_middle.active.delay", "2" }, { "conveyor_belt3_left", "RocksDC.pcx" }, { "conveyor_belt3_left.xpos", "0" }, { "conveyor_belt3_left.ypos", "7" }, @@ -1297,6 +1307,7 @@ struct ConfigInfo image_config[] = { "conveyor_belt3_left.active.xpos", "0" }, { "conveyor_belt3_left.active.ypos", "7" }, { "conveyor_belt3_left.active.frames", "8" }, + { "conveyor_belt3_left.active.delay", "2" }, { "conveyor_belt3_right", "RocksDC.pcx" }, { "conveyor_belt3_right.xpos", "0" }, { "conveyor_belt3_right.ypos", "8" }, @@ -1305,6 +1316,8 @@ struct ConfigInfo image_config[] = { "conveyor_belt3_right.active.xpos", "0" }, { "conveyor_belt3_right.active.ypos", "8" }, { "conveyor_belt3_right.active.frames", "8" }, + { "conveyor_belt3_right.active.delay", "2" }, + { "conveyor_belt3_right.active.delay", "2" }, { "conveyor_belt3_switch_left", "RocksDC.pcx" }, { "conveyor_belt3_switch_left.xpos", "2" }, { "conveyor_belt3_switch_left.ypos", "12" }, @@ -1326,6 +1339,7 @@ struct ConfigInfo image_config[] = { "conveyor_belt4_middle.active.xpos", "0" }, { "conveyor_belt4_middle.active.ypos", "9" }, { "conveyor_belt4_middle.active.frames", "8" }, + { "conveyor_belt4_middle.active.delay", "2" }, { "conveyor_belt4_left", "RocksDC.pcx" }, { "conveyor_belt4_left.xpos", "0" }, { "conveyor_belt4_left.ypos", "10" }, @@ -1334,6 +1348,7 @@ struct ConfigInfo image_config[] = { "conveyor_belt4_left.active.xpos", "0" }, { "conveyor_belt4_left.active.ypos", "10" }, { "conveyor_belt4_left.active.frames", "8" }, + { "conveyor_belt4_left.active.delay", "2" }, { "conveyor_belt4_right", "RocksDC.pcx" }, { "conveyor_belt4_right.xpos", "0" }, { "conveyor_belt4_right.ypos", "11" }, @@ -1342,6 +1357,8 @@ struct ConfigInfo image_config[] = { "conveyor_belt4_right.active.xpos", "0" }, { "conveyor_belt4_right.active.ypos", "11" }, { "conveyor_belt4_right.active.frames", "8" }, + { "conveyor_belt4_right.active.delay", "2" }, + { "conveyor_belt4_right.active.delay", "2" }, { "conveyor_belt4_switch_left", "RocksDC.pcx" }, { "conveyor_belt4_switch_left.xpos", "3" }, { "conveyor_belt4_switch_left.ypos", "12" }, @@ -1411,16 +1428,19 @@ struct ConfigInfo image_config[] = { "extra_time.xpos", "8" }, { "extra_time.ypos", "0" }, { "extra_time.frames", "6" }, + { "extra_time.delay", "4" }, { "shield_normal", "RocksDC.pcx" }, { "shield_normal.xpos", "8" }, { "shield_normal.ypos", "2" }, { "shield_normal.frames", "6" }, + { "shield_normal.delay", "4" }, { "shield_deadly", "RocksDC.pcx" }, { "shield_deadly.xpos", "8" }, { "shield_deadly.ypos", "1" }, { "shield_deadly.frames", "6" }, + { "shield_deadly.delay", "4" }, { "shield_normal.active", "RocksHeroes.pcx" }, { "shield_normal.active.xpos", "1" }, @@ -1565,6 +1585,8 @@ struct ConfigInfo image_config[] = { "trap.active.xpos", "4" }, { "trap.active.ypos", "0" }, { "trap.active.frames", "4" }, + { "trap.active.delay", "4" }, + { "trap.active.mode_pingpong2", "1" }, { "dx_supabomb", "RocksMore.pcx" }, { "dx_supabomb.xpos", "7" }, @@ -1718,6 +1740,10 @@ struct ConfigInfo image_config[] = { "wall_bd_diamond.ypos", "8" }, { "wall_bd_diamond.frames", "1" }, + { "wall_growing", "RocksElements.pcx" }, + { "wall_growing.xpos", "11" }, + { "wall_growing.ypos", "10" }, + { "wall_growing.frames", "1" }, { "wall_growing_xy", "RocksElements.pcx" }, { "wall_growing_xy.xpos", "4" }, { "wall_growing_xy.ypos", "9" }, @@ -1735,18 +1761,22 @@ struct ConfigInfo image_config[] = { "wall_growing_active_left.xpos", "8" }, { "wall_growing_active_left.ypos", "10" }, { "wall_growing_active_left.frames", "3" }, + { "wall_growing_active_left.delay", "6" }, { "wall_growing_active_right", "RocksElements.pcx" }, { "wall_growing_active_right.xpos", "5" }, { "wall_growing_active_right.ypos", "10" }, { "wall_growing_active_right.frames", "3" }, + { "wall_growing_active_right.delay", "6" }, { "wall_growing_active_up", "RocksHeroes.pcx" }, { "wall_growing_active_up.xpos", "3" }, { "wall_growing_active_up.ypos", "12" }, { "wall_growing_active_up.frames", "3" }, + { "wall_growing_active_up.delay", "6" }, { "wall_growing_active_down", "RocksHeroes.pcx" }, { "wall_growing_active_down.xpos", "0" }, { "wall_growing_active_down.ypos", "12" }, { "wall_growing_active_down.frames", "3" }, + { "wall_growing_active_down.delay", "6" }, { "black_orb", "RocksElements.pcx" }, { "black_orb.xpos", "13" }, @@ -1807,6 +1837,10 @@ struct ConfigInfo image_config[] = { "dynabomb_xl.ypos", "9" }, { "dynabomb_xl.frames", "1" }, + { "pig", "RocksHeroes.pcx" }, + { "pig.xpos", "8" }, + { "pig.ypos", "0" }, + { "pig.frames", "1" }, { "pig_down", "RocksHeroes.pcx" }, { "pig_down.xpos", "8" }, { "pig_down.ypos", "0" }, @@ -1864,6 +1898,10 @@ struct ConfigInfo image_config[] = { "pig_right.eating.frames", "4" }, { "pig_right.eating.delay", "2" }, + { "dragon", "RocksHeroes.pcx" }, + { "dragon.xpos", "8" }, + { "dragon.ypos", "2" }, + { "dragon.frames", "1" }, { "dragon_down", "RocksHeroes.pcx" }, { "dragon_down.xpos", "8" }, { "dragon_down.ypos", "2" }, @@ -1917,6 +1955,10 @@ struct ConfigInfo image_config[] = { "dragon_right.attacking.ypos", "3" }, { "dragon_right.attacking.frames", "1" }, + { "mole", "RocksHeroes.pcx" }, + { "mole.xpos", "8" }, + { "mole.ypos", "4" }, + { "mole.frames", "1" }, { "mole_down", "RocksHeroes.pcx" }, { "mole_down.xpos", "8" }, { "mole_down.ypos", "4" }, @@ -1974,6 +2016,10 @@ struct ConfigInfo image_config[] = { "mole_right.digging.frames", "4" }, { "mole_right.digging.delay", "2" }, + { "penguin", "RocksHeroes.pcx" }, + { "penguin.xpos", "8" }, + { "penguin.ypos", "6" }, + { "penguin.frames", "1" }, { "penguin_down", "RocksHeroes.pcx" }, { "penguin_down.xpos", "8" }, { "penguin_down.ypos", "6" }, @@ -2552,10 +2598,7 @@ struct ConfigInfo image_config[] = { "scrollbar_yellow.ypos", "2" }, { "scrollbar_yellow.frames", "1" }, - { "char_question", "RocksFontEM.pcx" }, - { "char_question.xpos", "15" }, - { "char_question.ypos", "1" }, - { "char_question.frames", "1" }, +#include "conf_chr.c" /* include auto-generated data structure definitions */ { NULL, NULL } };