X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.c;h=18547e320a43309b986593bf3f49da729555702b;hb=7cd6d9ecca4ccd4927eddc994b616569ef23b231;hp=23660fbd5f98dc942c7d28d4fb1bb8dd66252991;hpb=cd9add1d9479d1938d05ca9df4f31c3f99bd5f3e;p=rocksndiamonds.git diff --git a/src/main.c b/src/main.c index 23660fbd..18547e32 100644 --- a/src/main.c +++ b/src/main.c @@ -203,10 +203,17 @@ struct ConfigInfo image_config[] = { "bd_rock.falling.xpos", "4" }, { "bd_rock.falling.ypos", "2" }, { "bd_rock.falling.frames", "1" }, - { "bd_rock.pushing", "RocksMore.pcx" }, - { "bd_rock.pushing.xpos", "4" }, - { "bd_rock.pushing.ypos", "2" }, - { "bd_rock.pushing.frames", "4" }, + { "bd_rock.moving_left", "RocksMore.pcx" }, + { "bd_rock.moving_left.xpos", "4" }, + { "bd_rock.moving_left.ypos", "2" }, + { "bd_rock.moving_left.frames", "4" }, + { "bd_rock.moving_left.delay", "2" }, + { "bd_rock.moving_right", "RocksMore.pcx" }, + { "bd_rock.moving_right.xpos", "4" }, + { "bd_rock.moving_right.ypos", "2" }, + { "bd_rock.moving_right.frames", "4" }, + { "bd_rock.moving_right.delay", "2" }, + { "bd_rock.moving_right.mode_reverse", "1" }, { "bd_diamond", "RocksElements.pcx" }, { "bd_diamond.xpos", "0" }, @@ -346,10 +353,17 @@ struct ConfigInfo image_config[] = { "sp_zonk.falling.xpos", "1" }, { "sp_zonk.falling.ypos", "0" }, { "sp_zonk.falling.frames", "1" }, - { "sp_zonk.pushing", "RocksSP.pcx" }, - { "sp_zonk.pushing.xpos", "0" }, - { "sp_zonk.pushing.ypos", "6" }, - { "sp_zonk.pushing.frames", "4" }, + { "sp_zonk.moving_left", "RocksSP.pcx" }, + { "sp_zonk.moving_left.xpos", "0" }, + { "sp_zonk.moving_left.ypos", "6" }, + { "sp_zonk.moving_left.frames", "4" }, + { "sp_zonk.moving_left.delay", "2" }, + { "sp_zonk.moving_right", "RocksSP.pcx" }, + { "sp_zonk.moving_right.xpos", "0" }, + { "sp_zonk.moving_right.ypos", "6" }, + { "sp_zonk.moving_right.frames", "4" }, + { "sp_zonk.moving_right.delay", "2" }, + { "sp_zonk.moving_right.mode_reverse", "1" }, { "sp_base", "RocksSP.pcx" }, { "sp_base.xpos", "2" }, @@ -369,11 +383,13 @@ struct ConfigInfo image_config[] = { "sp_murphy_left.moving.ypos", "0" }, { "sp_murphy_left.moving.frames", "3" }, { "sp_murphy_left.moving.mode_pingpong", "1" }, + { "sp_murphy_left.moving.delay", "2" }, { "sp_murphy_left.digging", "RocksSP.pcx" }, { "sp_murphy_left.digging.xpos", "8" }, { "sp_murphy_left.digging.ypos", "0" }, { "sp_murphy_left.digging.frames", "3" }, { "sp_murphy_left.digging.mode_pingpong", "1" }, + { "sp_murphy_left.digging.delay", "2" }, { "sp_murphy_left.pushing", "RocksSP.pcx" }, { "sp_murphy_left.pushing.xpos", "11" }, { "sp_murphy_left.pushing.ypos", "1" }, @@ -392,11 +408,13 @@ struct ConfigInfo image_config[] = { "sp_murphy_right.moving.ypos", "0" }, { "sp_murphy_right.moving.frames", "3" }, { "sp_murphy_right.moving.mode_pingpong", "1" }, + { "sp_murphy_right.moving.delay", "2" }, { "sp_murphy_right.digging", "RocksSP.pcx" }, { "sp_murphy_right.digging.xpos", "11" }, { "sp_murphy_right.digging.ypos", "0" }, { "sp_murphy_right.digging.frames", "3" }, { "sp_murphy_right.digging.mode_pingpong", "1" }, + { "sp_murphy_right.digging.delay", "2" }, { "sp_murphy_right.pushing", "RocksSP.pcx" }, { "sp_murphy_right.pushing.xpos", "10" }, { "sp_murphy_right.pushing.ypos", "1" }, @@ -706,10 +724,17 @@ struct ConfigInfo image_config[] = { "rock.falling.xpos", "12" }, { "rock.falling.ypos", "0" }, { "rock.falling.frames", "1" }, - { "rock.pushing", "RocksElements.pcx" }, - { "rock.pushing.xpos", "12" }, - { "rock.pushing.ypos", "0" }, - { "rock.pushing.frames", "4" }, + { "rock.moving_left", "RocksElements.pcx" }, + { "rock.moving_left.xpos", "12" }, + { "rock.moving_left.ypos", "0" }, + { "rock.moving_left.frames", "4" }, + { "rock.moving_left.delay", "2" }, + { "rock.moving_right", "RocksElements.pcx" }, + { "rock.moving_right.xpos", "12" }, + { "rock.moving_right.ypos", "0" }, + { "rock.moving_right.frames", "4" }, + { "rock.moving_right.delay", "2" }, + { "rock.moving_right.mode_reverse", "1" }, { "emerald", "RocksElements.pcx" }, { "emerald.xpos", "8" }, @@ -910,16 +935,16 @@ struct ConfigInfo image_config[] = { "acid.frames", "4" }, { "acid.delay", "10" }, - { "acid.splashing_left", "RocksHeroes.pcx" }, - { "acid.splashing_left.xpos", "8" }, - { "acid.splashing_left.ypos", "10" }, - { "acid.splashing_left.frames", "4" }, - { "acid.splashing_left.delay", "2" }, - { "acid.splashing_right", "RocksHeroes.pcx" }, - { "acid.splashing_right.xpos", "12" }, - { "acid.splashing_right.ypos", "10" }, - { "acid.splashing_right.frames", "4" }, - { "acid.splashing_right.delay", "2" }, + { "acid_splash_left", "RocksHeroes.pcx" }, + { "acid_splash_left.xpos", "8" }, + { "acid_splash_left.ypos", "10" }, + { "acid_splash_left.frames", "4" }, + { "acid_splash_left.delay", "2" }, + { "acid_splash_right", "RocksHeroes.pcx" }, + { "acid_splash_right.xpos", "12" }, + { "acid_splash_right.ypos", "10" }, + { "acid_splash_right.frames", "4" }, + { "acid_splash_right.delay", "2" }, { "amoeba_drop", "RocksElements.pcx" }, { "amoeba_drop.xpos", "5" }, @@ -1446,12 +1471,14 @@ struct ConfigInfo image_config[] = { "shield_normal.active.xpos", "1" }, { "shield_normal.active.ypos", "13" }, { "shield_normal.active.frames", "3" }, + { "shield_normal.active.delay", "8" }, { "shield_normal.active.mode_pingpong", "1" }, { "shield_deadly.active", "RocksHeroes.pcx" }, { "shield_deadly.active.xpos", "5" }, { "shield_deadly.active.ypos", "13" }, { "shield_deadly.active.frames", "3" }, + { "shield_deadly.active.delay", "8" }, { "shield_deadly.active.mode_pingpong", "1" }, { "switchgate_closed", "RocksDC.pcx" }, @@ -2581,6 +2608,23 @@ struct ConfigInfo image_config[] = { "arrow_red_down.ypos", "1" }, { "arrow_red_down.frames", "1" }, + { "ball_red", "RocksElements.pcx" }, + { "ball_red.xpos", "12" }, + { "ball_red.ypos", "8" }, + { "ball_red.frames", "1" }, + { "ball_blue", "RocksElements.pcx" }, + { "ball_blue.xpos", "13" }, + { "ball_blue.ypos", "8" }, + { "ball_blue.frames", "1" }, + { "ball_yellow", "RocksElements.pcx" }, + { "ball_yellow.xpos", "14" }, + { "ball_yellow.ypos", "8" }, + { "ball_yellow.frames", "1" }, + { "ball_gray", "RocksElements.pcx" }, + { "ball_gray.xpos", "15" }, + { "ball_gray.ypos", "8" }, + { "ball_gray.frames", "1" }, + { "scrollbar_blue", "RocksMore.pcx" }, { "scrollbar_blue.xpos", "0" }, { "scrollbar_blue.ypos", "2" },