X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=364cedcde6db75c423e4279e78e9d073e432f336;hb=08ad905f20de863e1f86eb772ecc2fbf7721529d;hp=18547e320a43309b986593bf3f49da729555702b;hpb=7cd6d9ecca4ccd4927eddc994b616569ef23b231;p=rocksndiamonds.git diff --git a/src/main.c b/src/main.c index 18547e32..364cedcd 100644 --- a/src/main.c +++ b/src/main.c @@ -151,13 +151,17 @@ int graphics_action_mapping[] = 6, /* GFX_ACTION_PUSHING (7) */ 7, /* GFX_ACTION_PASSING (8) */ - 7, /* GFX_ACTION_IMPACT (9) */ + 7, /* GFX_ACTION_IMPACT (9) */ 7, /* GFX_ACTION_CRACKING (10) */ - 7, /* GFX_ACTION_ACTIVATING (11) */ - 7, /* GFX_ACTION_EATING (12) */ - 7, /* GFX_ACTION_ATTACKING (13) */ - 7, /* GFX_ACTION_GROWING (14) */ - 7 /* GFX_ACTION_OTHER (15) */ + 7, /* GFX_ACTION_BREAKING (11) */ + 7, /* GFX_ACTION_ACTIVATING (12) */ + 7, /* GFX_ACTION_OPENING (13) */ + 7, /* GFX_ACTION_CLOSING (14) */ + 7, /* GFX_ACTION_EATING (15) */ + 7, /* GFX_ACTION_ATTACKING (16) */ + 7, /* GFX_ACTION_GROWING (17) */ + 7, /* GFX_ACTION_SHRINKING (18) */ + 7 /* GFX_ACTION_OTHER (19) */ }; struct ConfigInfo image_config_suffix[] = @@ -167,16 +171,14 @@ struct ConfigInfo image_config_suffix[] = { ".offset", "32" }, { ".vertical", "0" }, { ".frames", "1" }, -#if 0 { ".start_frame", "-1" }, -#endif { ".delay", "1" }, { ".mode_loop", "0" }, { ".mode_linear", "0" }, { ".mode_pingpong", "0" }, { ".mode_pingpong2", "0" }, { ".mode_reverse", "0" }, - { ".global_sync", "0" }, + { ".global_sync", "-1" }, { NULL, NULL } }; @@ -208,12 +210,13 @@ struct ConfigInfo image_config[] = { "bd_rock.moving_left.ypos", "2" }, { "bd_rock.moving_left.frames", "4" }, { "bd_rock.moving_left.delay", "2" }, + { "bd_rock.moving_left.mode_reverse", "1" }, { "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.start_frame", "1" }, { "bd_rock.moving_right.delay", "2" }, - { "bd_rock.moving_right.mode_reverse", "1" }, { "bd_diamond", "RocksElements.pcx" }, { "bd_diamond.xpos", "0" }, @@ -221,10 +224,16 @@ struct ConfigInfo image_config[] = { "bd_diamond.frames", "4" }, { "bd_diamond.delay", "4" }, { "bd_diamond.mode_reverse", "1" }, + { "bd_diamond.moving", "RocksElements.pcx" }, + { "bd_diamond.moving.xpos", "3" }, + { "bd_diamond.moving.ypos", "10" }, + { "bd_diamond.moving.frames", "2" }, + { "bd_diamond.moving.delay", "4" }, { "bd_diamond.falling", "RocksElements.pcx" }, { "bd_diamond.falling.xpos", "3" }, { "bd_diamond.falling.ypos", "10" }, { "bd_diamond.falling.frames", "2" }, + { "bd_diamond.falling.delay", "4" }, { "bd_magic_wall", "RocksElements.pcx" }, { "bd_magic_wall.xpos", "12" }, @@ -358,12 +367,13 @@ struct ConfigInfo image_config[] = { "sp_zonk.moving_left.ypos", "6" }, { "sp_zonk.moving_left.frames", "4" }, { "sp_zonk.moving_left.delay", "2" }, + { "sp_zonk.moving_left.mode_reverse", "1" }, { "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.start_frame", "1" }, { "sp_zonk.moving_right.delay", "2" }, - { "sp_zonk.moving_right.mode_reverse", "1" }, { "sp_base", "RocksSP.pcx" }, { "sp_base.xpos", "2" }, @@ -613,7 +623,6 @@ struct ConfigInfo image_config[] = { "sp_electron.ypos", "10" }, { "sp_electron.frames", "8" }, { "sp_electron.delay", "2" }, - { "sp_electron.global_sync", "1" }, { "sp_terminal", "RocksSP.pcx" }, { "sp_terminal.xpos", "8" }, @@ -729,30 +738,43 @@ struct ConfigInfo image_config[] = { "rock.moving_left.ypos", "0" }, { "rock.moving_left.frames", "4" }, { "rock.moving_left.delay", "2" }, + { "rock.moving_left.mode_reverse", "1" }, { "rock.moving_right", "RocksElements.pcx" }, { "rock.moving_right.xpos", "12" }, { "rock.moving_right.ypos", "0" }, { "rock.moving_right.frames", "4" }, + { "rock.moving_right.start_frame", "1" }, { "rock.moving_right.delay", "2" }, - { "rock.moving_right.mode_reverse", "1" }, { "emerald", "RocksElements.pcx" }, { "emerald.xpos", "8" }, { "emerald.ypos", "0" }, { "emerald.frames", "1" }, + { "emerald.moving", "RocksElements.pcx" }, + { "emerald.moving.xpos", "8" }, + { "emerald.moving.ypos", "0" }, + { "emerald.moving.frames", "2" }, + { "emerald.moving.delay", "4" }, { "emerald.falling", "RocksElements.pcx" }, { "emerald.falling.xpos", "8" }, { "emerald.falling.ypos", "0" }, { "emerald.falling.frames", "2" }, + { "emerald.falling.delay", "4" }, { "diamond", "RocksElements.pcx" }, { "diamond.xpos", "10" }, { "diamond.ypos", "0" }, { "diamond.frames", "1" }, + { "diamond.moving", "RocksElements.pcx" }, + { "diamond.moving.xpos", "10" }, + { "diamond.moving.ypos", "0" }, + { "diamond.moving.frames", "2" }, + { "diamond.moving.delay", "4" }, { "diamond.falling", "RocksElements.pcx" }, { "diamond.falling.xpos", "10" }, { "diamond.falling.ypos", "0" }, { "diamond.falling.frames", "2" }, + { "diamond.falling.delay", "4" }, { "bomb", "RocksElements.pcx" }, { "bomb.xpos", "11" }, @@ -780,6 +802,7 @@ struct ConfigInfo image_config[] = { "dynamite.active.frames", "7" }, { "dynamite.active.delay", "12" }, { "dynamite.active.mode_linear", "1" }, + { "dynamite.active.global_sync", "0" }, { "wall_emerald", "RocksElements.pcx" }, { "wall_emerald.xpos", "4" }, @@ -848,6 +871,10 @@ struct ConfigInfo image_config[] = { "robot.ypos", "5" }, { "robot.frames", "4" }, { "robot.mode_pingpong2", "1" }, + { "robot.moving", "RocksElements.pcx" }, + { "robot.moving.xpos", "4" }, + { "robot.moving.ypos", "5" }, + { "robot.moving.frames", "1" }, { "robot_wheel", "RocksElements.pcx" }, { "robot_wheel.xpos", "0" }, @@ -940,11 +967,13 @@ struct ConfigInfo image_config[] = { "acid_splash_left.ypos", "10" }, { "acid_splash_left.frames", "4" }, { "acid_splash_left.delay", "2" }, + { "acid_splash_left.global_sync", "0" }, { "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" }, + { "acid_splash_right.global_sync", "0" }, { "amoeba_drop", "RocksElements.pcx" }, { "amoeba_drop.xpos", "5" }, @@ -1789,21 +1818,25 @@ struct ConfigInfo image_config[] = { "wall_growing_active_left.ypos", "10" }, { "wall_growing_active_left.frames", "3" }, { "wall_growing_active_left.delay", "6" }, + { "wall_growing_active_left.global_sync", "0" }, { "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_right.global_sync", "0" }, { "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_up.global_sync", "0" }, { "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" }, + { "wall_growing_active_down.global_sync", "0" }, { "black_orb", "RocksElements.pcx" }, { "black_orb.xpos", "13" }, @@ -2178,14 +2211,17 @@ struct ConfigInfo image_config[] = { "player1_down.moving.xpos", "0" }, { "player1_down.moving.ypos", "0" }, { "player1_down.moving.frames", "4" }, + { "player1_down.moving.start_frame", "1" }, + { "player1_down.moving.delay", "4" }, { "player1_down.digging", "RocksHeroes.pcx" }, { "player1_down.digging.xpos", "0" }, { "player1_down.digging.ypos", "0" }, { "player1_down.digging.frames", "4" }, { "player1_down.pushing", "RocksHeroes.pcx" }, { "player1_down.pushing.xpos", "0" }, - { "player1_down.pushing.ypos", "2" }, + { "player1_down.pushing.ypos", "0" }, { "player1_down.pushing.frames", "4" }, + { "player1_down.pushing.delay", "2" }, { "player1_down.snapping", "RocksHeroes.pcx" }, { "player1_down.snapping.xpos", "0" }, { "player1_down.snapping.ypos", "0" }, @@ -2198,6 +2234,8 @@ struct ConfigInfo image_config[] = { "player1_up.moving.xpos", "4" }, { "player1_up.moving.ypos", "0" }, { "player1_up.moving.frames", "4" }, + { "player1_up.moving.start_frame", "1" }, + { "player1_up.moving.delay", "4" }, { "player1_up.digging", "RocksHeroes.pcx" }, { "player1_up.digging.xpos", "4" }, { "player1_up.digging.ypos", "0" }, @@ -2206,6 +2244,7 @@ struct ConfigInfo image_config[] = { "player1_up.pushing.xpos", "4" }, { "player1_up.pushing.ypos", "0" }, { "player1_up.pushing.frames", "4" }, + { "player1_up.pushing.delay", "2" }, { "player1_up.snapping", "RocksHeroes.pcx" }, { "player1_up.snapping.xpos", "4" }, { "player1_up.snapping.ypos", "0" }, @@ -2218,6 +2257,8 @@ struct ConfigInfo image_config[] = { "player1_left.moving.xpos", "0" }, { "player1_left.moving.ypos", "1" }, { "player1_left.moving.frames", "4" }, + { "player1_left.moving.start_frame", "1" }, + { "player1_left.moving.delay", "4" }, { "player1_left.digging", "RocksHeroes.pcx" }, { "player1_left.digging.xpos", "0" }, { "player1_left.digging.ypos", "1" }, @@ -2226,6 +2267,7 @@ struct ConfigInfo image_config[] = { "player1_left.pushing.xpos", "4" }, { "player1_left.pushing.ypos", "2" }, { "player1_left.pushing.frames", "4" }, + { "player1_left.pushing.delay", "2" }, { "player1_left.snapping", "RocksHeroes.pcx" }, { "player1_left.snapping.xpos", "0" }, { "player1_left.snapping.ypos", "1" }, @@ -2238,6 +2280,8 @@ struct ConfigInfo image_config[] = { "player1_right.moving.xpos", "4" }, { "player1_right.moving.ypos", "1" }, { "player1_right.moving.frames", "4" }, + { "player1_right.moving.delay", "4" }, + { "player1_right.moving.start_frame", "1" }, { "player1_right.digging", "RocksHeroes.pcx" }, { "player1_right.digging.xpos", "4" }, { "player1_right.digging.ypos", "1" }, @@ -2246,6 +2290,7 @@ struct ConfigInfo image_config[] = { "player1_right.pushing.xpos", "0" }, { "player1_right.pushing.ypos", "2" }, { "player1_right.pushing.frames", "4" }, + { "player1_right.pushing.delay", "2" }, { "player1_right.snapping", "RocksHeroes.pcx" }, { "player1_right.snapping.xpos", "4" }, { "player1_right.snapping.ypos", "1" }, @@ -2269,7 +2314,7 @@ struct ConfigInfo image_config[] = { "player2_down.digging.frames", "4" }, { "player2_down.pushing", "RocksHeroes.pcx" }, { "player2_down.pushing.xpos", "0" }, - { "player2_down.pushing.ypos", "5" }, + { "player2_down.pushing.ypos", "3" }, { "player2_down.pushing.frames", "4" }, { "player2_down.snapping", "RocksHeroes.pcx" }, { "player2_down.snapping.xpos", "0" }, @@ -2354,7 +2399,7 @@ struct ConfigInfo image_config[] = { "player3_down.digging.frames", "4" }, { "player3_down.pushing", "RocksHeroes.pcx" }, { "player3_down.pushing.xpos", "0" }, - { "player3_down.pushing.ypos", "8" }, + { "player3_down.pushing.ypos", "6" }, { "player3_down.pushing.frames", "4" }, { "player3_down.snapping", "RocksHeroes.pcx" }, { "player3_down.snapping.xpos", "0" }, @@ -2439,7 +2484,7 @@ struct ConfigInfo image_config[] = { "player4_down.digging.frames", "4" }, { "player4_down.pushing", "RocksHeroes.pcx" }, { "player4_down.pushing.xpos", "0" }, - { "player4_down.pushing.ypos", "11" }, + { "player4_down.pushing.ypos", "9" }, { "player4_down.pushing.frames", "4" }, { "player4_down.snapping", "RocksHeroes.pcx" }, { "player4_down.snapping.xpos", "0" }, @@ -2517,12 +2562,14 @@ struct ConfigInfo image_config[] = { "twinkle_blue.frames", "3" }, { "twinkle_blue.delay", "2" }, { "twinkle_blue.mode_pingpong", "1" }, + { "twinkle_blue.global_sync", "0" }, { "twinkle_white", "RocksHeroes.pcx" }, { "twinkle_white.xpos", "13" }, { "twinkle_white.ypos", "11" }, { "twinkle_white.frames", "3" }, { "twinkle_white.delay", "2" }, { "twinkle_white.mode_pingpong", "1" }, + { "twinkle_white.global_sync", "0" }, { "steelwall_topleft", "RocksElements.pcx" }, { "steelwall_topleft.xpos", "0" },