X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Flogic.c;h=bfb387f468727b5dce51e57b2e766b8de5b69593;hb=9e073e68375e021ce34c7b7ccef33ee769dcaf03;hp=a465bbe3354dc7e83a9be5f646affe3b4240258e;hpb=2851c280138444b53cf088e4e4f3e7ef8787022c;p=rocksndiamonds.git diff --git a/src/game_em/logic.c b/src/game_em/logic.c index a465bbe3..bfb387f4 100644 --- a/src/game_em/logic.c +++ b/src/game_em/logic.c @@ -9,16 +9,18 @@ #define SPRING_ROLL /* spring rolling off round things continues to roll */ -#define USE_CHANGED_ACID_STUFF +#define ACID_ROLL /* rolling objects go into acid rather than remove it */ +#define ACID_PLAYER /* player gets killed by acid, but without explosion */ -#define RANDOM_RAW (seed = seed << 31 | seed >> 1) -#define RANDOM(x) (RANDOM_RAW & (x - 1)) +#define RANDOM_BUG /* handle problem with old tapes using 64-bit random */ + +#define RANDOM(x) ((seed = seed << 31 | seed >> 1) % x) static short **cave, **next, **boom; static unsigned int seed; static int score; -static const byte is_blank[TILE_MAX] = +static const byte is_blank[GAME_TILE_MAX] = { [Xblank] = 1, [Xsplash_e] = 1, @@ -33,7 +35,7 @@ static const byte is_blank[TILE_MAX] = [Xfake_acid_8] = 1 }; -static const byte is_blank_or_acid[TILE_MAX] = +static const byte is_blank_or_acid[GAME_TILE_MAX] = { [Xblank] = 1, [Xsplash_e] = 1, @@ -56,22 +58,51 @@ static const byte is_blank_or_acid[TILE_MAX] = [Xacid_8] = 1 }; -static const byte is_fake_acid[TILE_MAX] = -{ - [Xfake_acid_1] = 1, - [Xfake_acid_2] = 1, - [Xfake_acid_3] = 1, - [Xfake_acid_4] = 1, - [Xfake_acid_5] = 1, - [Xfake_acid_6] = 1, - [Xfake_acid_7] = 1, - [Xfake_acid_8] = 1 +static const byte is_player[GAME_TILE_MAX] = +{ + [Zplayer] = 1, + [Xfake_acid_1_player] = 1, + [Xfake_acid_2_player] = 1, + [Xfake_acid_3_player] = 1, + [Xfake_acid_4_player] = 1, + [Xfake_acid_5_player] = 1, + [Xfake_acid_6_player] = 1, + [Xfake_acid_7_player] = 1, + [Xfake_acid_8_player] = 1 +}; + +static const byte add_player[GAME_TILE_MAX] = +{ + [Xblank] = Zplayer, + [Xsplash_e] = Zplayer, + [Xsplash_w] = Zplayer, + [Xfake_acid_1] = Xfake_acid_1_player, + [Xfake_acid_2] = Xfake_acid_2_player, + [Xfake_acid_3] = Xfake_acid_3_player, + [Xfake_acid_4] = Xfake_acid_4_player, + [Xfake_acid_5] = Xfake_acid_5_player, + [Xfake_acid_6] = Xfake_acid_6_player, + [Xfake_acid_7] = Xfake_acid_7_player, + [Xfake_acid_8] = Xfake_acid_8_player }; -static const byte is_amoeba[TILE_MAX] = +static const byte remove_player[GAME_TILE_MAX] = +{ + [Zplayer] = Xblank, + [Xfake_acid_1_player] = Xfake_acid_1, + [Xfake_acid_2_player] = Xfake_acid_2, + [Xfake_acid_3_player] = Xfake_acid_3, + [Xfake_acid_4_player] = Xfake_acid_4, + [Xfake_acid_5_player] = Xfake_acid_5, + [Xfake_acid_6_player] = Xfake_acid_6, + [Xfake_acid_7_player] = Xfake_acid_7, + [Xfake_acid_8_player] = Xfake_acid_8 +}; + +static const byte is_amoeba[GAME_TILE_MAX] = { [Xfake_amoeba] = 1, - [Xfake_amoebaB] = 1, + [Yfake_amoeba] = 1, [Xamoeba_1] = 1, [Xamoeba_2] = 1, [Xamoeba_3] = 1, @@ -82,7 +113,22 @@ static const byte is_amoeba[TILE_MAX] = [Xamoeba_8] = 1 }; -static const byte is_android_walkable[TILE_MAX] = +static byte is_android_blank[GAME_TILE_MAX] = +{ + [Xblank] = 1, + [Xsplash_e] = 1, + [Xsplash_w] = 1, + [Xfake_acid_1] = 1, + [Xfake_acid_2] = 1, + [Xfake_acid_3] = 1, + [Xfake_acid_4] = 1, + [Xfake_acid_5] = 1, + [Xfake_acid_6] = 1, + [Xfake_acid_7] = 1, + [Xfake_acid_8] = 1 +}; + +static const byte is_android_walkable[GAME_TILE_MAX] = { [Xblank] = 1, [Xsplash_e] = 1, @@ -111,31 +157,34 @@ static void Lboom_generic(int x, int y, int element, int element_middle) boom[x+1][y+1] = element; } -static void Lboom_bug(int x, int y, int by_element) +static void Lboom_bug(int x, int y) { - next[x][y] = Znormal; + if (game_em.use_old_explosions) + next[x][y] = Zbug; Lboom_generic(x, y, Xemerald, Xdiamond); #if PLAY_ELEMENT_SOUND - play_element_sound(x, y, SOUND_boom, by_element); + play_element_sound(x, y, SOUND_boom, Xbug_1_n); #endif } -static void Lboom_tank(int x, int y, int by_element) +static void Lboom_tank(int x, int y) { - next[x][y] = Znormal; + if (game_em.use_old_explosions) + next[x][y] = Ztank; Lboom_generic(x, y, Xblank, Xblank); #if PLAY_ELEMENT_SOUND - play_element_sound(x, y, SOUND_boom, by_element); + play_element_sound(x, y, SOUND_boom, Xtank_1_n); #endif } -static void Lboom_eater(int x, int y, int by_element) +static void Lboom_eater(int x, int y) { - next[x][y] = Znormal; + if (game_em.use_old_explosions) + next[x][y] = Zeater; boom[x-1][y-1] = lev.eater_array[lev.eater_pos][0]; boom[x][y-1] = lev.eater_array[lev.eater_pos][1]; @@ -147,13 +196,95 @@ static void Lboom_eater(int x, int y, int by_element) boom[x][y+1] = lev.eater_array[lev.eater_pos][7]; boom[x+1][y+1] = lev.eater_array[lev.eater_pos][8]; - lev.eater_pos = (lev.eater_pos + 1) & 7; + lev.eater_pos = (lev.eater_pos + 1) % lev.num_eater_arrays; #if PLAY_ELEMENT_SOUND - play_element_sound(x, y, SOUND_boom, by_element); + play_element_sound(x, y, SOUND_boom, Xeater_n); #endif } +static void Lboom_bug_old(int x, int y) +{ + if (!game_em.use_old_explosions) + return; + + Lboom_bug(x, y); +} + +static void Lboom_tank_old(int x, int y) +{ + if (!game_em.use_old_explosions) + return; + + Lboom_tank(x, y); +} + +static void Lboom_eater_old(int x, int y) +{ + if (!game_em.use_old_explosions) + return; + + Lboom_eater(x, y); +} + +static void Lboom_bug_new(int x, int y, boolean chain_explosion) +{ + if (game_em.use_old_explosions) + return; + + if (chain_explosion) + cave[x][y] = Xchain; + + Lboom_bug(x, y); +} + +static void Lboom_tank_new(int x, int y, boolean chain_explosion) +{ + if (game_em.use_old_explosions) + return; + + if (chain_explosion) + cave[x][y] = Xchain; + + Lboom_tank(x, y); +} + +static void Lboom_eater_new(int x, int y, boolean chain_explosion) +{ + if (game_em.use_old_explosions) + return; + + if (chain_explosion) + cave[x][y] = Xchain; + + Lboom_eater(x, y); +} + +static void Lboom_cave_new(int x, int y, int element) +{ + if (game_em.use_old_explosions) + return; + + cave[x][y] = element; +} + +static void Lboom_next_new(int x, int y, int element) +{ + if (game_em.use_old_explosions) + return; + + next[x][y] = element; +} + +static void Lpush_element_old(int x, int y, int element) +{ + if (!game_em.use_old_push_elements) + return; + + cave[x][y] = element; + next[x][y] = element; +} + static boolean player_killed(struct PLAYER *ply) { int x = ply->x; @@ -251,6 +382,7 @@ static boolean player_killed(struct PLAYER *ply) switch (cave[x][y]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -262,7 +394,14 @@ static boolean player_killed(struct PLAYER *ply) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: - case Zplayer: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: case Xdynamite_1: case Xdynamite_2: case Xdynamite_3: @@ -278,7 +417,7 @@ static void kill_player(struct PLAYER *ply) int x = ply->x; int y = ply->y; - ply->alive = 0; + ply->alive = FALSE; switch (cave[x][y-1]) { @@ -291,6 +430,7 @@ static void kill_player(struct PLAYER *ply) case Xbug_2_s: case Xbug_2_w: cave[x][y-1] = Xboom_bug; + Lboom_bug_new(x, y-1, TRUE); break; case Xtank_1_n: @@ -301,7 +441,8 @@ static void kill_player(struct PLAYER *ply) case Xtank_2_e: case Xtank_2_s: case Xtank_2_w: - cave[x][y-1] = Xboom_bomb; + cave[x][y-1] = Xboom_tank; + Lboom_tank_new(x, y-1, TRUE); break; } @@ -316,6 +457,7 @@ static void kill_player(struct PLAYER *ply) case Xbug_2_s: case Xbug_2_w: cave[x+1][y] = Xboom_bug; + Lboom_bug_new(x+1, y, TRUE); break; case Xtank_1_n: @@ -326,7 +468,8 @@ static void kill_player(struct PLAYER *ply) case Xtank_2_e: case Xtank_2_s: case Xtank_2_w: - cave[x+1][y] = Xboom_bomb; + cave[x+1][y] = Xboom_tank; + Lboom_tank_new(x+1, y, TRUE); break; } @@ -341,6 +484,7 @@ static void kill_player(struct PLAYER *ply) case Xbug_2_s: case Xbug_2_w: cave[x][y+1] = Xboom_bug; + Lboom_bug_new(x, y+1, TRUE); break; case Xtank_1_n: @@ -351,7 +495,8 @@ static void kill_player(struct PLAYER *ply) case Xtank_2_e: case Xtank_2_s: case Xtank_2_w: - cave[x][y+1] = Xboom_bomb; + cave[x][y+1] = Xboom_tank; + Lboom_tank_new(x, y+1, TRUE); break; } @@ -366,6 +511,7 @@ static void kill_player(struct PLAYER *ply) case Xbug_2_s: case Xbug_2_w: cave[x-1][y] = Xboom_bug; + Lboom_bug_new(x-1, y, TRUE); break; case Xtank_1_n: @@ -376,7 +522,8 @@ static void kill_player(struct PLAYER *ply) case Xtank_2_e: case Xtank_2_s: case Xtank_2_w: - cave[x-1][y] = Xboom_bomb; + cave[x-1][y] = Xboom_tank; + Lboom_tank_new(x-1, y, TRUE); break; } @@ -397,7 +544,7 @@ static void kill_player(struct PLAYER *ply) switch (cave[x][y]) { -#ifdef USE_CHANGED_ACID_STUFF +#ifdef ACID_PLAYER case Xacid_1: case Xacid_2: case Xacid_3: @@ -431,7 +578,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) if (dx && dy && ply->joy_snap) /* more than one direction specified */ return FALSE; - if (ply->joy_snap == 0) /* player wants to move */ + if (!ply->joy_snap) /* player wants to move */ { int element = cave[x][y]; @@ -441,8 +588,6 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xblank: case Xsplash_e: case Xsplash_w: - cave[x][y] = Zplayer; - next[x][y] = Zplayer; case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -451,13 +596,15 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + cave[x][y] = add_player[element]; + next[x][y] = add_player[element]; + play_element_sound(x, y, SOUND_blank, Xblank); ply->anim = PLY_walk_n + anim; ply->x = x; ply->y = y; break; -#ifdef USE_CHANGED_ACID_STUFF case Xacid_1: case Xacid_2: case Xacid_3: @@ -466,13 +613,14 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xacid_6: case Xacid_7: case Xacid_8: +#ifdef ACID_PLAYER if (cave[x+1][y-1] == Xblank) cave[x+1][y-1] = Xsplash_e; if (cave[x-1][y-1] == Xblank) cave[x-1][y-1] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); + // FALL THROUGH #endif - case Xboom_android: case Xboom_1: case Xbug_1_n: @@ -491,17 +639,6 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xtank_2_e: case Xtank_2_s: case Xtank_2_w: - -#ifndef USE_CHANGED_ACID_STUFF - case Xacid_1: - case Xacid_2: - case Xacid_3: - case Xacid_4: - case Xacid_5: - case Xacid_6: - case Xacid_7: - case Xacid_8: -#endif ply->anim = PLY_walk_n + anim; ply->x = x; ply->y = y; @@ -533,7 +670,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) next[x][y] = Zplayer; play_element_sound(x, y, SOUND_collect, element); lev.score += lev.diamond_score; - lev.required = lev.required < 3 ? 0 : lev.required - 3; + lev.gems_needed = lev.gems_needed < 3 ? 0 : lev.gems_needed - 3; game.snapshot.collected_item = TRUE; ply->anim = PLY_walk_n + anim; ply->x = x; @@ -546,7 +683,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) next[x][y] = Zplayer; play_element_sound(x, y, SOUND_collect, element); lev.score += lev.emerald_score; - lev.required = lev.required < 1 ? 0 : lev.required - 1; + lev.gems_needed = lev.gems_needed < 1 ? 0 : lev.gems_needed - 1; game.snapshot.collected_item = TRUE; ply->anim = PLY_walk_n + anim; ply->x = x; @@ -1013,11 +1150,10 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) if (!is_blank[cave[x+dx][y+dy]]) break; - if (!is_fake_acid[cave[x+dx][y+dy]]) - { - cave[x+dx][y+dy] = Zplayer; - next[x+dx][y+dy] = Zplayer; - } + int element_next = cave[x+dx][y+dy]; + + cave[x+dx][y+dy] = add_player[element_next]; + next[x+dx][y+dy] = add_player[element_next]; play_element_sound(x, y, SOUND_door, element); ply->anim = PLY_walk_n + anim; @@ -1066,7 +1202,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xswitch: play_element_sound(x, y, SOUND_press, element); lev.ball_cnt = lev.ball_time; - lev.ball_state = !lev.ball_state; + lev.ball_active = !lev.ball_active; break; case Xplant: @@ -1124,7 +1260,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) next[x][y] = Xblank; play_element_sound(x, y, SOUND_collect, element); lev.score += lev.diamond_score; - lev.required = lev.required < 3 ? 0 : lev.required - 3; + lev.gems_needed = lev.gems_needed < 3 ? 0 : lev.gems_needed - 3; game.snapshot.collected_item = TRUE; ply->anim = PLY_walk_n + anim; break; @@ -1135,7 +1271,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) next[x][y] = Xblank; play_element_sound(x, y, SOUND_collect, element); lev.score += lev.emerald_score; - lev.required = lev.required < 1 ? 0 : lev.required - 1; + lev.gems_needed = lev.gems_needed < 1 ? 0 : lev.gems_needed - 1; game.snapshot.collected_item = TRUE; ply->anim = PLY_walk_n + anim; break; @@ -1220,6 +1356,11 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) } } + /* check for wrap-around movement */ + if (ply->x < lev.left || + ply->x > lev.right - 1) + play_element_sound(oldx, oldy, SOUND_door, Xdoor_1); + return result; } @@ -1287,7 +1428,10 @@ static void check_player(struct PLAYER *ply) if (!can_move) { - ply->joy_n = ply->joy_e = ply->joy_s = ply->joy_w = 0; + ply->joy_n = FALSE; + ply->joy_e = FALSE; + ply->joy_s = FALSE; + ply->joy_w = FALSE; return; } @@ -1295,7 +1439,7 @@ static void check_player(struct PLAYER *ply) if (dx == 0 && dy == 0) { - ply->joy_stick = 0; + ply->joy_stick = FALSE; if (ply->joy_drop) { @@ -1311,17 +1455,21 @@ static void check_player(struct PLAYER *ply) ply->dynamite_cnt = 0; } - RandomEM += 7; /* be a bit more random if the player doesn't move */ + /* be a bit more random if the player doesn't move */ + game_em.random += 7; return; } - ply->joy_stick = 1; - ply->joy_n = ply->joy_e = ply->joy_s = ply->joy_w = 0; + ply->joy_stick = TRUE; + ply->joy_n = FALSE; + ply->joy_e = FALSE; + ply->joy_s = FALSE; + ply->joy_w = FALSE; + ply->dynamite_cnt = 0; /* reset dynamite timer if we move */ - ply->joy_spin = !ply->joy_spin; - if (ply->joy_snap == 0) /* player wants to move */ + if (!ply->joy_snap) /* player wants to move */ { boolean moved = FALSE; @@ -1466,14 +1614,14 @@ static void Landroid(int x, int y) if (lev.android_clone_cnt == 0) { - if (!is_blank[cave[x-1][y-1]] && - !is_blank[cave[x][y-1]] && - !is_blank[cave[x+1][y-1]] && - !is_blank[cave[x-1][y]] && - !is_blank[cave[x+1][y]] && - !is_blank[cave[x-1][y+1]] && - !is_blank[cave[x][y+1]] && - !is_blank[cave[x+1][y+1]]) + if (!is_android_blank[cave[x-1][y-1]] && + !is_android_blank[cave[x][y-1]] && + !is_android_blank[cave[x+1][y-1]] && + !is_android_blank[cave[x-1][y]] && + !is_android_blank[cave[x+1][y]] && + !is_android_blank[cave[x-1][y+1]] && + !is_android_blank[cave[x][y+1]] && + !is_android_blank[cave[x+1][y+1]]) goto android_move; switch (RANDOM(8)) @@ -1577,91 +1725,91 @@ static void Landroid(int x, int y) /* randomly find a direction to move */ case 0: /* S,NE,W,NW,SE,E,SW,N */ - if (is_blank[cave[x][y+1]]) goto android_s; - if (is_blank[cave[x+1][y-1]]) goto android_ne; - if (is_blank[cave[x-1][y]]) goto android_w; - if (is_blank[cave[x-1][y-1]]) goto android_nw; - if (is_blank[cave[x+1][y+1]]) goto android_se; - if (is_blank[cave[x+1][y]]) goto android_e; - if (is_blank[cave[x-1][y+1]]) goto android_sw; - if (is_blank[cave[x][y-1]]) goto android_n; + if (is_android_blank[cave[x][y+1]]) goto android_s; + if (is_android_blank[cave[x+1][y-1]]) goto android_ne; + if (is_android_blank[cave[x-1][y]]) goto android_w; + if (is_android_blank[cave[x-1][y-1]]) goto android_nw; + if (is_android_blank[cave[x+1][y+1]]) goto android_se; + if (is_android_blank[cave[x+1][y]]) goto android_e; + if (is_android_blank[cave[x-1][y+1]]) goto android_sw; + if (is_android_blank[cave[x][y-1]]) goto android_n; goto android_move; case 1: /* NW,SE,N,S,NE,SW,E,W */ - if (is_blank[cave[x-1][y-1]]) goto android_nw; - if (is_blank[cave[x+1][y+1]]) goto android_se; - if (is_blank[cave[x][y-1]]) goto android_n; - if (is_blank[cave[x][y+1]]) goto android_s; - if (is_blank[cave[x+1][y-1]]) goto android_ne; - if (is_blank[cave[x-1][y+1]]) goto android_sw; - if (is_blank[cave[x+1][y]]) goto android_e; - if (is_blank[cave[x-1][y]]) goto android_w; + if (is_android_blank[cave[x-1][y-1]]) goto android_nw; + if (is_android_blank[cave[x+1][y+1]]) goto android_se; + if (is_android_blank[cave[x][y-1]]) goto android_n; + if (is_android_blank[cave[x][y+1]]) goto android_s; + if (is_android_blank[cave[x+1][y-1]]) goto android_ne; + if (is_android_blank[cave[x-1][y+1]]) goto android_sw; + if (is_android_blank[cave[x+1][y]]) goto android_e; + if (is_android_blank[cave[x-1][y]]) goto android_w; goto android_move; case 2: /* SW,E,S,W,N,NW,SE,NE */ - if (is_blank[cave[x-1][y+1]]) goto android_sw; - if (is_blank[cave[x+1][y]]) goto android_e; - if (is_blank[cave[x][y+1]]) goto android_s; - if (is_blank[cave[x-1][y]]) goto android_w; - if (is_blank[cave[x][y-1]]) goto android_n; - if (is_blank[cave[x-1][y-1]]) goto android_nw; - if (is_blank[cave[x+1][y+1]]) goto android_se; - if (is_blank[cave[x+1][y-1]]) goto android_ne; + if (is_android_blank[cave[x-1][y+1]]) goto android_sw; + if (is_android_blank[cave[x+1][y]]) goto android_e; + if (is_android_blank[cave[x][y+1]]) goto android_s; + if (is_android_blank[cave[x-1][y]]) goto android_w; + if (is_android_blank[cave[x][y-1]]) goto android_n; + if (is_android_blank[cave[x-1][y-1]]) goto android_nw; + if (is_android_blank[cave[x+1][y+1]]) goto android_se; + if (is_android_blank[cave[x+1][y-1]]) goto android_ne; goto android_move; case 3: /* N,SE,NE,E,W,S,NW,SW */ - if (is_blank[cave[x][y-1]]) goto android_n; - if (is_blank[cave[x+1][y+1]]) goto android_se; - if (is_blank[cave[x+1][y-1]]) goto android_ne; - if (is_blank[cave[x+1][y]]) goto android_e; - if (is_blank[cave[x-1][y]]) goto android_w; - if (is_blank[cave[x][y+1]]) goto android_s; - if (is_blank[cave[x-1][y-1]]) goto android_nw; - if (is_blank[cave[x-1][y+1]]) goto android_sw; + if (is_android_blank[cave[x][y-1]]) goto android_n; + if (is_android_blank[cave[x+1][y+1]]) goto android_se; + if (is_android_blank[cave[x+1][y-1]]) goto android_ne; + if (is_android_blank[cave[x+1][y]]) goto android_e; + if (is_android_blank[cave[x-1][y]]) goto android_w; + if (is_android_blank[cave[x][y+1]]) goto android_s; + if (is_android_blank[cave[x-1][y-1]]) goto android_nw; + if (is_android_blank[cave[x-1][y+1]]) goto android_sw; goto android_move; case 4: /* SE,NW,E,NE,SW,W,N,S */ - if (is_blank[cave[x+1][y+1]]) goto android_se; - if (is_blank[cave[x-1][y-1]]) goto android_nw; - if (is_blank[cave[x+1][y]]) goto android_e; - if (is_blank[cave[x+1][y-1]]) goto android_ne; - if (is_blank[cave[x-1][y+1]]) goto android_sw; - if (is_blank[cave[x-1][y]]) goto android_w; - if (is_blank[cave[x][y-1]]) goto android_n; - if (is_blank[cave[x][y+1]]) goto android_s; + if (is_android_blank[cave[x+1][y+1]]) goto android_se; + if (is_android_blank[cave[x-1][y-1]]) goto android_nw; + if (is_android_blank[cave[x+1][y]]) goto android_e; + if (is_android_blank[cave[x+1][y-1]]) goto android_ne; + if (is_android_blank[cave[x-1][y+1]]) goto android_sw; + if (is_android_blank[cave[x-1][y]]) goto android_w; + if (is_android_blank[cave[x][y-1]]) goto android_n; + if (is_android_blank[cave[x][y+1]]) goto android_s; goto android_move; case 5: /* NE,W,SE,SW,S,N,E,NW */ - if (is_blank[cave[x+1][y-1]]) goto android_ne; - if (is_blank[cave[x-1][y]]) goto android_w; - if (is_blank[cave[x+1][y+1]]) goto android_se; - if (is_blank[cave[x-1][y+1]]) goto android_sw; - if (is_blank[cave[x][y+1]]) goto android_s; - if (is_blank[cave[x][y-1]]) goto android_n; - if (is_blank[cave[x+1][y]]) goto android_e; - if (is_blank[cave[x-1][y-1]]) goto android_nw; + if (is_android_blank[cave[x+1][y-1]]) goto android_ne; + if (is_android_blank[cave[x-1][y]]) goto android_w; + if (is_android_blank[cave[x+1][y+1]]) goto android_se; + if (is_android_blank[cave[x-1][y+1]]) goto android_sw; + if (is_android_blank[cave[x][y+1]]) goto android_s; + if (is_android_blank[cave[x][y-1]]) goto android_n; + if (is_android_blank[cave[x+1][y]]) goto android_e; + if (is_android_blank[cave[x-1][y-1]]) goto android_nw; goto android_move; case 6: /* E,N,SW,S,NW,NE,SE,W */ - if (is_blank[cave[x+1][y]]) goto android_e; - if (is_blank[cave[x][y-1]]) goto android_n; - if (is_blank[cave[x-1][y+1]]) goto android_sw; - if (is_blank[cave[x][y+1]]) goto android_s; - if (is_blank[cave[x-1][y-1]]) goto android_nw; - if (is_blank[cave[x+1][y-1]]) goto android_ne; - if (is_blank[cave[x+1][y+1]]) goto android_se; - if (is_blank[cave[x-1][y]]) goto android_w; + if (is_android_blank[cave[x+1][y]]) goto android_e; + if (is_android_blank[cave[x][y-1]]) goto android_n; + if (is_android_blank[cave[x-1][y+1]]) goto android_sw; + if (is_android_blank[cave[x][y+1]]) goto android_s; + if (is_android_blank[cave[x-1][y-1]]) goto android_nw; + if (is_android_blank[cave[x+1][y-1]]) goto android_ne; + if (is_android_blank[cave[x+1][y+1]]) goto android_se; + if (is_android_blank[cave[x-1][y]]) goto android_w; goto android_move; case 7: /* W,SW,NW,N,E,SE,NE,S */ - if (is_blank[cave[x-1][y]]) goto android_w; - if (is_blank[cave[x-1][y+1]]) goto android_sw; - if (is_blank[cave[x-1][y-1]]) goto android_nw; - if (is_blank[cave[x][y-1]]) goto android_n; - if (is_blank[cave[x+1][y]]) goto android_e; - if (is_blank[cave[x+1][y+1]]) goto android_se; - if (is_blank[cave[x+1][y-1]]) goto android_ne; - if (is_blank[cave[x][y+1]]) goto android_s; + if (is_android_blank[cave[x-1][y]]) goto android_w; + if (is_android_blank[cave[x-1][y+1]]) goto android_sw; + if (is_android_blank[cave[x-1][y-1]]) goto android_nw; + if (is_android_blank[cave[x][y-1]]) goto android_n; + if (is_android_blank[cave[x+1][y]]) goto android_e; + if (is_android_blank[cave[x+1][y+1]]) goto android_se; + if (is_android_blank[cave[x+1][y-1]]) goto android_ne; + if (is_android_blank[cave[x][y+1]]) goto android_s; goto android_move; } } @@ -1669,14 +1817,14 @@ static void Landroid(int x, int y) android_move: if (lev.android_move_cnt == 0) { - if (cave[x-1][y-1] == Zplayer || - cave[x][y-1] == Zplayer || - cave[x+1][y-1] == Zplayer || - cave[x-1][y] == Zplayer || - cave[x+1][y] == Zplayer || - cave[x-1][y+1] == Zplayer || - cave[x][y+1] == Zplayer || - cave[x+1][y+1] == Zplayer) + if (is_player[cave[x-1][y-1]] || + is_player[cave[x][y-1]] || + is_player[cave[x+1][y-1]] || + is_player[cave[x-1][y]] || + is_player[cave[x+1][y]] || + is_player[cave[x-1][y+1]] || + is_player[cave[x][y+1]] || + is_player[cave[x+1][y+1]]) goto android_still; set_nearest_player_xy(x, y, &dx, &dy); @@ -2259,6 +2407,7 @@ static void Leater_n(int x, int y) switch (cave[x][y-1]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -2270,9 +2419,16 @@ static void Leater_n(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: case Xplant: case Yplant: - case Zplayer: cave[x][y] = Yeater_nB; next[x][y] = Xblank; cave[x][y-1] = Yeater_n; @@ -2339,6 +2495,7 @@ static void Leater_e(int x, int y) switch (cave[x+1][y]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -2350,9 +2507,16 @@ static void Leater_e(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: case Xplant: case Yplant: - case Zplayer: cave[x][y] = Yeater_eB; next[x][y] = Xblank; cave[x+1][y] = Yeater_e; @@ -2419,6 +2583,7 @@ static void Leater_s(int x, int y) switch (cave[x][y+1]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -2430,9 +2595,16 @@ static void Leater_s(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: case Xplant: case Yplant: - case Zplayer: cave[x][y] = Yeater_sB; next[x][y] = Xblank; cave[x][y+1] = Yeater_s; @@ -2499,6 +2671,7 @@ static void Leater_w(int x, int y) switch (cave[x-1][y]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -2510,9 +2683,16 @@ static void Leater_w(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: case Xplant: case Yplant: - case Zplayer: cave[x][y] = Yeater_wB; next[x][y] = Xblank; cave[x-1][y] = Yeater_w; @@ -2563,6 +2743,7 @@ static void Lalien(int x, int y) { switch (cave[x][y-1]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -2574,9 +2755,16 @@ static void Lalien(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: case Xplant: case Yplant: - case Zplayer: cave[x][y] = Yalien_nB; next[x][y] = Xblank; cave[x][y-1] = Yalien_n; @@ -2606,6 +2794,7 @@ static void Lalien(int x, int y) { switch (cave[x][y+1]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -2617,9 +2806,16 @@ static void Lalien(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: case Xplant: case Yplant: - case Zplayer: cave[x][y] = Yalien_sB; next[x][y] = Xblank; cave[x][y+1] = Yalien_s; @@ -2652,6 +2848,7 @@ static void Lalien(int x, int y) { switch (cave[x+1][y]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -2663,9 +2860,16 @@ static void Lalien(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: case Xplant: case Yplant: - case Zplayer: cave[x][y] = Yalien_eB; next[x][y] = Xblank; cave[x+1][y] = Yalien_e; @@ -2695,6 +2899,7 @@ static void Lalien(int x, int y) { switch (cave[x-1][y]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -2706,9 +2911,16 @@ static void Lalien(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: case Xplant: case Yplant: - case Zplayer: cave[x][y] = Yalien_wB; next[x][y] = Xblank; cave[x-1][y] = Yalien_w; @@ -2746,6 +2958,7 @@ static void Lbug_n(int x, int y) { switch (cave[x][y-1]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -2757,9 +2970,16 @@ static void Lbug_n(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: case Xplant: case Yplant: - case Zplayer: cave[x][y] = Ybug_nB; next[x][y] = Xblank; cave[x][y-1] = Ybug_n; @@ -2799,13 +3019,15 @@ static void Lbug_1_n(int x, int y) is_amoeba[cave[x][y+1]] || is_amoeba[cave[x-1][y]]) { - Lboom_bug(x, y, Xbug_1_n); + next[x][y] = Zboom; + Lboom_bug(x, y); return; } switch (cave[x+1][y]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -2817,6 +3039,14 @@ static void Lbug_1_n(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: case Xplant: case Yplant: case Xacid_1: @@ -2827,7 +3057,6 @@ static void Lbug_1_n(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - case Zplayer: cave[x][y] = Ybug_n_e; next[x][y] = Xbug_2_e; play_element_sound(x, y, SOUND_bug, Xbug_1_n); @@ -2846,7 +3075,8 @@ static void Lbug_2_n(int x, int y) is_amoeba[cave[x][y+1]] || is_amoeba[cave[x-1][y]]) { - Lboom_bug(x, y, Xbug_2_n); + next[x][y] = Zboom; + Lboom_bug(x, y); return; } @@ -2858,6 +3088,7 @@ static void Lbug_e(int x, int y) { switch (cave[x+1][y]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -2869,9 +3100,16 @@ static void Lbug_e(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: case Xplant: case Yplant: - case Zplayer: cave[x][y] = Ybug_eB; next[x][y] = Xblank; cave[x+1][y] = Ybug_e; @@ -2911,13 +3149,15 @@ static void Lbug_1_e(int x, int y) is_amoeba[cave[x][y+1]] || is_amoeba[cave[x-1][y]]) { - Lboom_bug(x, y, Xbug_1_e); + next[x][y] = Zboom; + Lboom_bug(x, y); return; } switch (cave[x][y+1]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -2929,6 +3169,14 @@ static void Lbug_1_e(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: case Xplant: case Yplant: case Xacid_1: @@ -2939,7 +3187,6 @@ static void Lbug_1_e(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - case Zplayer: cave[x][y] = Ybug_e_s; next[x][y] = Xbug_2_s; play_element_sound(x, y, SOUND_bug, Xbug_1_e); @@ -2958,7 +3205,8 @@ static void Lbug_2_e(int x, int y) is_amoeba[cave[x][y+1]] || is_amoeba[cave[x-1][y]]) { - Lboom_bug(x, y, Xbug_2_e); + next[x][y] = Zboom; + Lboom_bug(x, y); return; } @@ -2970,6 +3218,7 @@ static void Lbug_s(int x, int y) { switch (cave[x][y+1]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -2981,9 +3230,16 @@ static void Lbug_s(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: case Xplant: case Yplant: - case Zplayer: cave[x][y] = Ybug_sB; next[x][y] = Xblank; cave[x][y+1] = Ybug_s; @@ -3023,13 +3279,15 @@ static void Lbug_1_s(int x, int y) is_amoeba[cave[x][y+1]] || is_amoeba[cave[x-1][y]]) { - Lboom_bug(x, y, Xbug_1_s); + next[x][y] = Zboom; + Lboom_bug(x, y); return; } switch (cave[x-1][y]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -3041,6 +3299,14 @@ static void Lbug_1_s(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: case Xplant: case Yplant: case Xacid_1: @@ -3051,7 +3317,6 @@ static void Lbug_1_s(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - case Zplayer: cave[x][y] = Ybug_s_w; next[x][y] = Xbug_2_w; play_element_sound(x, y, SOUND_bug, Xbug_1_s); @@ -3070,7 +3335,8 @@ static void Lbug_2_s(int x, int y) is_amoeba[cave[x][y+1]] || is_amoeba[cave[x-1][y]]) { - Lboom_bug(x, y, Xbug_2_s); + next[x][y] = Zboom; + Lboom_bug(x, y); return; } @@ -3082,6 +3348,7 @@ static void Lbug_w(int x, int y) { switch (cave[x-1][y]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -3093,9 +3360,16 @@ static void Lbug_w(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: case Xplant: case Yplant: - case Zplayer: cave[x][y] = Ybug_wB; next[x][y] = Xblank; cave[x-1][y] = Ybug_w; @@ -3135,13 +3409,15 @@ static void Lbug_1_w(int x, int y) is_amoeba[cave[x][y+1]] || is_amoeba[cave[x-1][y]]) { - Lboom_bug(x, y, Xbug_1_w); + next[x][y] = Zboom; + Lboom_bug(x, y); return; } switch (cave[x][y-1]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -3153,6 +3429,14 @@ static void Lbug_1_w(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: case Xplant: case Yplant: case Xacid_1: @@ -3163,7 +3447,6 @@ static void Lbug_1_w(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - case Zplayer: cave[x][y] = Ybug_w_n; next[x][y] = Xbug_2_n; play_element_sound(x, y, SOUND_bug, Xbug_1_w); @@ -3182,7 +3465,8 @@ static void Lbug_2_w(int x, int y) is_amoeba[cave[x][y+1]] || is_amoeba[cave[x-1][y]]) { - Lboom_bug(x, y, Xbug_2_w); + next[x][y] = Zboom; + Lboom_bug(x, y); return; } @@ -3194,6 +3478,7 @@ static void Ltank_n(int x, int y) { switch (cave[x][y-1]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -3205,9 +3490,16 @@ static void Ltank_n(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: case Xplant: case Yplant: - case Zplayer: cave[x][y] = Ytank_nB; next[x][y] = Xblank; cave[x][y-1] = Ytank_n; @@ -3247,13 +3539,15 @@ static void Ltank_1_n(int x, int y) is_amoeba[cave[x][y+1]] || is_amoeba[cave[x-1][y]]) { - Lboom_tank(x, y, Xtank_1_n); + next[x][y] = Zboom; + Lboom_tank(x, y); return; } switch (cave[x-1][y]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -3265,6 +3559,14 @@ static void Ltank_1_n(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: case Xplant: case Yplant: case Xacid_1: @@ -3275,7 +3577,6 @@ static void Ltank_1_n(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - case Zplayer: cave[x][y] = Ytank_n_w; next[x][y] = Xtank_2_w; play_element_sound(x, y, SOUND_tank, Xtank_1_n); @@ -3294,7 +3595,8 @@ static void Ltank_2_n(int x, int y) is_amoeba[cave[x][y+1]] || is_amoeba[cave[x-1][y]]) { - Lboom_tank(x, y, Xtank_2_n); + next[x][y] = Zboom; + Lboom_tank(x, y); return; } @@ -3306,6 +3608,7 @@ static void Ltank_e(int x, int y) { switch (cave[x+1][y]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -3317,9 +3620,16 @@ static void Ltank_e(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: case Xplant: case Yplant: - case Zplayer: cave[x][y] = Ytank_eB; next[x][y] = Xblank; cave[x+1][y] = Ytank_e; @@ -3359,13 +3669,15 @@ static void Ltank_1_e(int x, int y) is_amoeba[cave[x][y+1]] || is_amoeba[cave[x-1][y]]) { - Lboom_tank(x, y, Xtank_1_e); + next[x][y] = Zboom; + Lboom_tank(x, y); return; } switch (cave[x][y-1]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -3377,6 +3689,14 @@ static void Ltank_1_e(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: case Xplant: case Yplant: case Xacid_1: @@ -3387,7 +3707,6 @@ static void Ltank_1_e(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - case Zplayer: cave[x][y] = Ytank_e_n; next[x][y] = Xtank_2_n; play_element_sound(x, y, SOUND_tank, Xtank_1_e); @@ -3406,7 +3725,8 @@ static void Ltank_2_e(int x, int y) is_amoeba[cave[x][y+1]] || is_amoeba[cave[x-1][y]]) { - Lboom_tank(x, y, Xtank_2_e); + next[x][y] = Zboom; + Lboom_tank(x, y); return; } @@ -3418,6 +3738,7 @@ static void Ltank_s(int x, int y) { switch (cave[x][y+1]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -3429,9 +3750,16 @@ static void Ltank_s(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: case Xplant: case Yplant: - case Zplayer: cave[x][y] = Ytank_sB; next[x][y] = Xblank; cave[x][y+1] = Ytank_s; @@ -3471,13 +3799,15 @@ static void Ltank_1_s(int x, int y) is_amoeba[cave[x][y+1]] || is_amoeba[cave[x-1][y]]) { - Lboom_tank(x, y, Xtank_1_s); + next[x][y] = Zboom; + Lboom_tank(x, y); return; } switch (cave[x+1][y]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -3489,6 +3819,14 @@ static void Ltank_1_s(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: case Xplant: case Yplant: case Xacid_1: @@ -3499,7 +3837,6 @@ static void Ltank_1_s(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - case Zplayer: cave[x][y] = Ytank_s_e; next[x][y] = Xtank_2_e; play_element_sound(x, y, SOUND_tank, Xtank_1_s); @@ -3518,7 +3855,8 @@ static void Ltank_2_s(int x, int y) is_amoeba[cave[x][y+1]] || is_amoeba[cave[x-1][y]]) { - Lboom_tank(x, y, Xtank_2_s); + next[x][y] = Zboom; + Lboom_tank(x, y); return; } @@ -3530,6 +3868,7 @@ static void Ltank_w(int x, int y) { switch (cave[x-1][y]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -3541,9 +3880,16 @@ static void Ltank_w(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: case Xplant: case Yplant: - case Zplayer: cave[x][y] = Ytank_wB; next[x][y] = Xblank; cave[x-1][y] = Ytank_w; @@ -3583,13 +3929,15 @@ static void Ltank_1_w(int x, int y) is_amoeba[cave[x][y+1]] || is_amoeba[cave[x-1][y]]) { - Lboom_tank(x, y, Xtank_1_w); + next[x][y] = Zboom; + Lboom_tank(x, y); return; } switch (cave[x][y+1]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -3601,6 +3949,14 @@ static void Ltank_1_w(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: case Xplant: case Yplant: case Xacid_1: @@ -3611,7 +3967,6 @@ static void Ltank_1_w(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - case Zplayer: cave[x][y] = Ytank_w_s; next[x][y] = Xtank_2_s; play_element_sound(x, y, SOUND_tank, Xtank_1_w); @@ -3630,7 +3985,8 @@ static void Ltank_2_w(int x, int y) is_amoeba[cave[x][y+1]] || is_amoeba[cave[x-1][y]]) { - Lboom_tank(x, y, Xtank_2_w); + next[x][y] = Zboom; + Lboom_tank(x, y); return; } @@ -3676,10 +4032,6 @@ static void Lemerald(int x, int y) play_element_sound(x, y, SOUND_acid, Xacid_1); return; - case Xspring: - case Xspring_pause: - case Xspring_e: - case Xspring_w: case Xandroid: case Xandroid_1_n: case Xandroid_2_n: @@ -3689,24 +4041,20 @@ static void Lemerald(int x, int y) case Xandroid_2_s: case Xandroid_1_w: case Xandroid_2_w: - case Xstone: - case Xstone_pause: case Xemerald: case Xemerald_pause: case Xdiamond: case Xdiamond_pause: + case Xstone: + case Xstone_pause: case Xbomb: case Xbomb_pause: - case Xballoon: - case Xacid_ne: - case Xacid_nw: - case Xball_1: - case Xball_2: case Xnut: case Xnut_pause: - case Xslide_ns: - case Xslide_ew: - case Xwonderwall: + case Xspring: + case Xspring_pause: + case Xspring_e: + case Xspring_w: case Xkey_1: case Xkey_2: case Xkey_3: @@ -3715,12 +4063,17 @@ static void Lemerald(int x, int y) case Xkey_6: case Xkey_7: case Xkey_8: - case Xbumper: + case Xballoon: + case Xball_1: + case Xball_2: + case Xwonderwall: case Xswitch: - case Xsteel_1: - case Xsteel_2: - case Xsteel_3: - case Xsteel_4: + case Xbumper: + case Ybumper: + case Xacid_ne: + case Xacid_nw: + case Xslide_ns: + case Xslide_ew: case Xwall_1: case Xwall_2: case Xwall_3: @@ -3729,6 +4082,10 @@ static void Lemerald(int x, int y) case Xroundwall_2: case Xroundwall_3: case Xroundwall_4: + case Xsteel_1: + case Xsteel_2: + case Xsteel_3: + case Xsteel_4: if (RANDOM(2)) { if (is_blank[cave[x+1][y]] && is_blank_or_acid[cave[x+1][y+1]]) @@ -3737,6 +4094,8 @@ static void Lemerald(int x, int y) next[x][y] = Xblank; cave[x+1][y] = Yemerald_e; next[x+1][y] = Xemerald_pause; + if (cave[x][y+1] == Xbumper) + cave[x][y+1] = Ybumper; return; } @@ -3746,6 +4105,8 @@ static void Lemerald(int x, int y) next[x][y] = Xblank; cave[x-1][y] = Yemerald_w; next[x-1][y] = Xemerald_pause; + if (cave[x][y+1] == Xbumper) + cave[x][y+1] = Ybumper; return; } } @@ -3757,6 +4118,8 @@ static void Lemerald(int x, int y) next[x][y] = Xblank; cave[x-1][y] = Yemerald_w; next[x-1][y] = Xemerald_pause; + if (cave[x][y+1] == Xbumper) + cave[x][y+1] = Ybumper; return; } @@ -3766,6 +4129,8 @@ static void Lemerald(int x, int y) next[x][y] = Xblank; cave[x+1][y] = Yemerald_e; next[x+1][y] = Xemerald_pause; + if (cave[x][y+1] == Xbumper) + cave[x][y+1] = Ybumper; return; } } @@ -3830,6 +4195,7 @@ static void Lemerald_fall(int x, int y) { switch (cave[x][y+1]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -3841,7 +4207,14 @@ static void Lemerald_fall(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: - case Zplayer: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: cave[x][y] = Yemerald_sB; next[x][y] = Xblank; cave[x][y+1] = Yemerald_s; @@ -3866,17 +4239,16 @@ static void Lemerald_fall(int x, int y) return; case Xwonderwall: - if (lev.wonderwall_time) + if (lev.wonderwall_time > 0) { - lev.wonderwall_state = 1; + lev.wonderwall_active = TRUE; cave[x][y] = Yemerald_sB; + next[x][y] = Xblank; if (is_blank[cave[x][y+2]]) { cave[x][y+2] = Ydiamond_s; next[x][y+2] = Xdiamond_fall; } - - next[x][y] = Xblank; play_element_sound(x, y, SOUND_wonderfall, Xwonderwall); return; } @@ -3927,10 +4299,6 @@ static void Ldiamond(int x, int y) play_element_sound(x, y, SOUND_acid, Xacid_1); return; - case Xspring: - case Xspring_pause: - case Xspring_e: - case Xspring_w: case Xandroid: case Xandroid_1_n: case Xandroid_2_n: @@ -3940,24 +4308,20 @@ static void Ldiamond(int x, int y) case Xandroid_2_s: case Xandroid_1_w: case Xandroid_2_w: - case Xstone: - case Xstone_pause: case Xemerald: case Xemerald_pause: case Xdiamond: case Xdiamond_pause: + case Xstone: + case Xstone_pause: case Xbomb: case Xbomb_pause: - case Xballoon: - case Xacid_ne: - case Xacid_nw: - case Xball_1: - case Xball_2: case Xnut: case Xnut_pause: - case Xslide_ns: - case Xslide_ew: - case Xwonderwall: + case Xspring: + case Xspring_pause: + case Xspring_e: + case Xspring_w: case Xkey_1: case Xkey_2: case Xkey_3: @@ -3966,12 +4330,17 @@ static void Ldiamond(int x, int y) case Xkey_6: case Xkey_7: case Xkey_8: - case Xbumper: + case Xballoon: + case Xball_1: + case Xball_2: + case Xwonderwall: case Xswitch: - case Xsteel_1: - case Xsteel_2: - case Xsteel_3: - case Xsteel_4: + case Xbumper: + case Ybumper: + case Xacid_ne: + case Xacid_nw: + case Xslide_ns: + case Xslide_ew: case Xwall_1: case Xwall_2: case Xwall_3: @@ -3980,6 +4349,10 @@ static void Ldiamond(int x, int y) case Xroundwall_2: case Xroundwall_3: case Xroundwall_4: + case Xsteel_1: + case Xsteel_2: + case Xsteel_3: + case Xsteel_4: if (RANDOM(2)) { if (is_blank[cave[x+1][y]] && is_blank_or_acid[cave[x+1][y+1]]) @@ -3988,6 +4361,8 @@ static void Ldiamond(int x, int y) next[x][y] = Xblank; cave[x+1][y] = Ydiamond_e; next[x+1][y] = Xdiamond_pause; + if (cave[x][y+1] == Xbumper) + cave[x][y+1] = Ybumper; return; } @@ -3997,6 +4372,8 @@ static void Ldiamond(int x, int y) next[x][y] = Xblank; cave[x-1][y] = Ydiamond_w; next[x-1][y] = Xdiamond_pause; + if (cave[x][y+1] == Xbumper) + cave[x][y+1] = Ybumper; return; } } @@ -4008,6 +4385,8 @@ static void Ldiamond(int x, int y) next[x][y] = Xblank; cave[x-1][y] = Ydiamond_w; next[x-1][y] = Xdiamond_pause; + if (cave[x][y+1] == Xbumper) + cave[x][y+1] = Ybumper; return; } @@ -4017,6 +4396,8 @@ static void Ldiamond(int x, int y) next[x][y] = Xblank; cave[x+1][y] = Ydiamond_e; next[x+1][y] = Xdiamond_pause; + if (cave[x][y+1] == Xbumper) + cave[x][y+1] = Ybumper; return; } } @@ -4081,6 +4462,7 @@ static void Ldiamond_fall(int x, int y) { switch (cave[x][y+1]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -4092,7 +4474,14 @@ static void Ldiamond_fall(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: - case Zplayer: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: cave[x][y] = Ydiamond_sB; next[x][y] = Xblank; cave[x][y+1] = Ydiamond_s; @@ -4117,17 +4506,16 @@ static void Ldiamond_fall(int x, int y) return; case Xwonderwall: - if (lev.wonderwall_time) + if (lev.wonderwall_time > 0) { - lev.wonderwall_state = 1; + lev.wonderwall_active = TRUE; cave[x][y] = Ydiamond_sB; + next[x][y] = Xblank; if (is_blank[cave[x][y+2]]) { cave[x][y+2] = Ystone_s; next[x][y+2] = Xstone_fall; } - - next[x][y] = Xblank; play_element_sound(x, y, SOUND_wonderfall, Xwonderwall); return; } @@ -4187,10 +4575,6 @@ static void Lstone(int x, int y) next[x][y+1] = Xsand_sandstone_2; return; - case Xspring: - case Xspring_pause: - case Xspring_e: - case Xspring_w: case Xandroid: case Xandroid_1_n: case Xandroid_2_n: @@ -4200,35 +4584,40 @@ static void Lstone(int x, int y) case Xandroid_2_s: case Xandroid_1_w: case Xandroid_2_w: - case Xstone: - case Xstone_pause: case Xemerald: case Xemerald_pause: case Xdiamond: case Xdiamond_pause: + case Xstone: + case Xstone_pause: case Xbomb: case Xbomb_pause: - case Xballoon: - case Xacid_ne: - case Xacid_nw: - case Xball_1: - case Xball_2: case Xnut: case Xnut_pause: - case Xslide_ns: - case Xslide_ew: - case Xkey_1: - case Xkey_2: - case Xkey_3: + case Xspring: + case Xspring_pause: + case Xspring_e: + case Xspring_w: + case Xkey_1: + case Xkey_2: + case Xkey_3: case Xkey_4: case Xkey_5: case Xkey_6: case Xkey_7: case Xkey_8: - case Xbumper: + case Xballoon: + case Xball_1: + case Xball_2: case Xswitch: + case Xbumper: + case Ybumper: + case Xacid_ne: + case Xacid_nw: case Xlenses: case Xmagnify: + case Xslide_ns: + case Xslide_ew: case Xroundwall_1: case Xroundwall_2: case Xroundwall_3: @@ -4241,6 +4630,8 @@ static void Lstone(int x, int y) next[x][y] = Xblank; cave[x+1][y] = Ystone_e; next[x+1][y] = Xstone_pause; + if (cave[x][y+1] == Xbumper) + cave[x][y+1] = Ybumper; return; } @@ -4250,6 +4641,8 @@ static void Lstone(int x, int y) next[x][y] = Xblank; cave[x-1][y] = Ystone_w; next[x-1][y] = Xstone_pause; + if (cave[x][y+1] == Xbumper) + cave[x][y+1] = Ybumper; return; } } @@ -4261,6 +4654,8 @@ static void Lstone(int x, int y) next[x][y] = Xblank; cave[x-1][y] = Ystone_w; next[x-1][y] = Xstone_pause; + if (cave[x][y+1] == Xbumper) + cave[x][y+1] = Ybumper; return; } @@ -4270,6 +4665,8 @@ static void Lstone(int x, int y) next[x][y] = Xblank; cave[x+1][y] = Ystone_e; next[x+1][y] = Xstone_pause; + if (cave[x][y+1] == Xbumper) + cave[x][y+1] = Ybumper; return; } } @@ -4325,6 +4722,7 @@ static void Lstone_fall(int x, int y) { switch (cave[x][y+1]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -4336,7 +4734,14 @@ static void Lstone_fall(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: - case Zplayer: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: cave[x][y] = Ystone_sB; next[x][y] = Xblank; cave[x][y+1] = Ystone_s; @@ -4360,13 +4765,26 @@ static void Lstone_fall(int x, int y) play_element_sound(x, y, SOUND_acid, Xacid_1); return; - case Xnut: - case Xnut_pause: - next[x][y] = Xstone; - cave[x][y+1] = Ynut_stone; - next[x][y+1] = Xemerald; - play_element_sound(x, y, SOUND_crack, Xnut); - score += lev.nut_score; + case Xeater_n: + case Xeater_e: + case Xeater_s: + case Xeater_w: + cave[x][y] = Ystone_sB; + Lboom_next_new(x, y, Xblank); + cave[x][y+1] = Yeater_stone; + next[x][y+1] = Zeater; + Lboom_eater_old(x, y+1); + score += lev.eater_score; + return; + + case Xalien: + case Xalien_pause: + cave[x][y] = Ystone_sB; + Lboom_next_new(x, y, Xblank); + cave[x][y+1] = Yalien_stone; + next[x][y+1] = Ztank; + Lboom_tank_old(x, y+1); + score += lev.alien_score; return; case Xbug_1_n: @@ -4378,8 +4796,10 @@ static void Lstone_fall(int x, int y) case Xbug_2_s: case Xbug_2_w: cave[x][y] = Ystone_sB; + Lboom_next_new(x, y, Xblank); cave[x][y+1] = Ybug_stone; - Lboom_bug(x, y+1, Xstone_fall); + next[x][y+1] = Zbug; + Lboom_bug_old(x, y+1); score += lev.bug_score; return; @@ -4392,11 +4812,109 @@ static void Lstone_fall(int x, int y) case Xtank_2_s: case Xtank_2_w: cave[x][y] = Ystone_sB; + Lboom_next_new(x, y, Xblank); cave[x][y+1] = Ytank_stone; - Lboom_tank(x, y+1, Xstone_fall); + next[x][y+1] = Ztank; + Lboom_tank_old(x, y+1); score += lev.tank_score; return; + case Xdiamond: + case Xdiamond_pause: + switch (cave[x][y+2]) + { + case Zplayer: + case Xblank: + case Xsplash_e: + case Xsplash_w: + case Xfake_acid_1: + case Xfake_acid_2: + case Xfake_acid_3: + case Xfake_acid_4: + case Xfake_acid_5: + case Xfake_acid_6: + case Xfake_acid_7: + case Xfake_acid_8: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: + case Xplant: + case Yplant: + case Xacid_1: + case Xacid_2: + case Xacid_3: + case Xacid_4: + case Xacid_5: + case Xacid_6: + case Xacid_7: + case Xacid_8: + case Xandroid: + case Xandroid_1_n: + case Xandroid_2_n: + case Xandroid_1_e: + case Xandroid_2_e: + case Xandroid_1_s: + case Xandroid_2_s: + case Xandroid_1_w: + case Xandroid_2_w: + case Xbug_1_n: + case Xbug_1_e: + case Xbug_1_s: + case Xbug_1_w: + case Xbug_2_n: + case Xbug_2_e: + case Xbug_2_s: + case Xbug_2_w: + case Xtank_1_n: + case Xtank_1_e: + case Xtank_1_s: + case Xtank_1_w: + case Xtank_2_n: + case Xtank_2_e: + case Xtank_2_s: + case Xtank_2_w: + case Xemerald_fall: + case Xdiamond_fall: + case Xstone_fall: + case Xbomb_fall: + case Xnut_fall: + case Xspring_fall: + case Xacid_s: + next[x][y] = Xstone; + play_element_sound(x, y, SOUND_stone, Xstone); + return; + } + + cave[x][y] = Ystone_sB; + next[x][y] = Xblank; + cave[x][y+1] = Ydiamond_stone; + next[x][y+1] = Xstone_pause; + play_element_sound(x, y, SOUND_squash, Xdiamond); + return; + + case Xbomb: + case Xbomb_pause: + Lboom_cave_new(x, y, Xstone); + Lboom_next_new(x, y, Xstone); + cave[x][y+1] = Ybomb_blank; + next[x][y+1] = Ztank; + Lboom_tank_old(x, y+1); + return; + + case Xnut: + case Xnut_pause: + next[x][y] = Xstone; + cave[x][y+1] = Ynut_stone; + next[x][y+1] = Xemerald; + play_element_sound(x, y, SOUND_crack, Xnut); + score += lev.nut_score; + return; + case Xspring: if (RANDOM(2)) { @@ -4451,113 +4969,17 @@ static void Lstone_fall(int x, int y) next[x][y] = Xstone; return; - case Xeater_n: - case Xeater_e: - case Xeater_s: - case Xeater_w: - cave[x][y] = Ystone_sB; - cave[x][y+1] = Yeater_stone; - Lboom_eater(x, y+1, Xstone_fall); - score += lev.eater_score; - return; - - case Xalien: - case Xalien_pause: - cave[x][y] = Ystone_sB; - cave[x][y+1] = Yalien_stone; - Lboom_tank(x, y+1, Xstone_fall); - score += lev.alien_score; - return; - - case Xdiamond: - case Xdiamond_pause: - switch (cave[x][y+2]) - { - case Xblank: - case Xsplash_e: - case Xsplash_w: - case Xfake_acid_1: - case Xfake_acid_2: - case Xfake_acid_3: - case Xfake_acid_4: - case Xfake_acid_5: - case Xfake_acid_6: - case Xfake_acid_7: - case Xfake_acid_8: - case Zplayer: - case Xbug_1_n: - case Xbug_1_e: - case Xbug_1_s: - case Xbug_1_w: - case Xbug_2_n: - case Xbug_2_e: - case Xbug_2_s: - case Xbug_2_w: - case Xtank_1_n: - case Xtank_1_e: - case Xtank_1_s: - case Xtank_1_w: - case Xtank_2_n: - case Xtank_2_e: - case Xtank_2_s: - case Xtank_2_w: - case Xspring_fall: - case Xandroid: - case Xandroid_1_n: - case Xandroid_2_n: - case Xandroid_1_e: - case Xandroid_2_e: - case Xandroid_1_s: - case Xandroid_2_s: - case Xandroid_1_w: - case Xandroid_2_w: - case Xstone_fall: - case Xemerald_fall: - case Xdiamond_fall: - case Xbomb_fall: - case Xacid_s: - case Xacid_1: - case Xacid_2: - case Xacid_3: - case Xacid_4: - case Xacid_5: - case Xacid_6: - case Xacid_7: - case Xacid_8: - case Xnut_fall: - case Xplant: - case Yplant: - next[x][y] = Xstone; - play_element_sound(x, y, SOUND_stone, Xstone); - return; - } - - cave[x][y] = Ystone_sB; - next[x][y] = Xblank; - cave[x][y+1] = Ydiamond_stone; - next[x][y+1] = Xstone_pause; - play_element_sound(x, y, SOUND_squash, Xdiamond); - return; - - case Xbomb: - case Xbomb_pause: - cave[x][y+1] = Ybomb_blank; - Lboom_tank(x, y+1, Xstone_fall); - return; - case Xwonderwall: - if (lev.wonderwall_time) + if (lev.wonderwall_time > 0) { - lev.wonderwall_state = 1; + lev.wonderwall_active = TRUE; cave[x][y] = Ystone_sB; - + next[x][y] = Xblank; if (is_blank[cave[x][y+2]]) { cave[x][y+2] = Yemerald_s; next[x][y+2] = Xemerald_fall; } - - next[x][y] = Xblank; play_element_sound(x, y, SOUND_wonderfall, Xwonderwall); return; } @@ -4608,10 +5030,6 @@ static void Lbomb(int x, int y) play_element_sound(x, y, SOUND_acid, Xacid_1); return; - case Xspring: - case Xspring_pause: - case Xspring_e: - case Xspring_w: case Xandroid: case Xandroid_1_n: case Xandroid_2_n: @@ -4621,23 +5039,20 @@ static void Lbomb(int x, int y) case Xandroid_2_s: case Xandroid_1_w: case Xandroid_2_w: - case Xstone: - case Xstone_pause: case Xemerald: case Xemerald_pause: case Xdiamond: case Xdiamond_pause: + case Xstone: + case Xstone_pause: case Xbomb: case Xbomb_pause: - case Xballoon: - case Xacid_ne: - case Xacid_nw: - case Xball_1: - case Xball_2: case Xnut: case Xnut_pause: - case Xslide_ns: - case Xslide_ew: + case Xspring: + case Xspring_pause: + case Xspring_e: + case Xspring_w: case Xkey_1: case Xkey_2: case Xkey_3: @@ -4646,8 +5061,16 @@ static void Lbomb(int x, int y) case Xkey_6: case Xkey_7: case Xkey_8: - case Xbumper: + case Xballoon: + case Xball_1: + case Xball_2: case Xswitch: + case Xbumper: + case Ybumper: + case Xacid_ne: + case Xacid_nw: + case Xslide_ns: + case Xslide_ew: case Xroundwall_1: case Xroundwall_2: case Xroundwall_3: @@ -4660,6 +5083,8 @@ static void Lbomb(int x, int y) next[x][y] = Xblank; cave[x+1][y] = Ybomb_e; next[x+1][y] = Xbomb_pause; + if (cave[x][y+1] == Xbumper) + cave[x][y+1] = Ybumper; return; } @@ -4669,6 +5094,8 @@ static void Lbomb(int x, int y) next[x][y] = Xblank; cave[x-1][y] = Ybomb_w; next[x-1][y] = Xbomb_pause; + if (cave[x][y+1] == Xbumper) + cave[x][y+1] = Ybumper; return; } } @@ -4680,6 +5107,8 @@ static void Lbomb(int x, int y) next[x][y] = Xblank; cave[x-1][y] = Ybomb_w; next[x-1][y] = Xbomb_pause; + if (cave[x][y+1] == Xbumper) + cave[x][y+1] = Ybumper; return; } @@ -4689,6 +5118,8 @@ static void Lbomb(int x, int y) next[x][y] = Xblank; cave[x+1][y] = Ybomb_e; next[x+1][y] = Xbomb_pause; + if (cave[x][y+1] == Xbumper) + cave[x][y+1] = Ybumper; return; } } @@ -4780,7 +5211,8 @@ static void Lbomb_fall(int x, int y) default: cave[x][y] = Ybomb_blank; - Lboom_tank(x, y, Xbomb_fall); + next[x][y] = Ztank; + Lboom_tank_old(x, y); return; } } @@ -4823,10 +5255,6 @@ static void Lnut(int x, int y) play_element_sound(x, y, SOUND_acid, Xacid_1); return; - case Xspring: - case Xspring_pause: - case Xspring_e: - case Xspring_w: case Xandroid: case Xandroid_1_n: case Xandroid_2_n: @@ -4835,24 +5263,21 @@ static void Lnut(int x, int y) case Xandroid_1_s: case Xandroid_2_s: case Xandroid_1_w: - case Xandroid_2_w: - case Xstone: - case Xstone_pause: + case Xandroid_2_w: case Xemerald: case Xemerald_pause: case Xdiamond: case Xdiamond_pause: + case Xstone: + case Xstone_pause: case Xbomb: case Xbomb_pause: - case Xballoon: - case Xacid_ne: - case Xacid_nw: - case Xball_1: - case Xball_2: case Xnut: case Xnut_pause: - case Xslide_ns: - case Xslide_ew: + case Xspring: + case Xspring_pause: + case Xspring_e: + case Xspring_w: case Xkey_1: case Xkey_2: case Xkey_3: @@ -4861,8 +5286,16 @@ static void Lnut(int x, int y) case Xkey_6: case Xkey_7: case Xkey_8: - case Xbumper: + case Xballoon: + case Xball_1: + case Xball_2: case Xswitch: + case Xbumper: + case Ybumper: + case Xacid_ne: + case Xacid_nw: + case Xslide_ns: + case Xslide_ew: case Xroundwall_1: case Xroundwall_2: case Xroundwall_3: @@ -4875,6 +5308,8 @@ static void Lnut(int x, int y) next[x][y] = Xblank; cave[x+1][y] = Ynut_e; next[x+1][y] = Xnut_pause; + if (cave[x][y+1] == Xbumper) + cave[x][y+1] = Ybumper; return; } @@ -4884,6 +5319,8 @@ static void Lnut(int x, int y) next[x][y] = Xblank; cave[x-1][y] = Ynut_w; next[x-1][y] = Xnut_pause; + if (cave[x][y+1] == Xbumper) + cave[x][y+1] = Ybumper; return; } } @@ -4895,6 +5332,8 @@ static void Lnut(int x, int y) next[x][y] = Xblank; cave[x-1][y] = Ynut_w; next[x-1][y] = Xnut_pause; + if (cave[x][y+1] == Xbumper) + cave[x][y+1] = Ybumper; return; } @@ -4904,6 +5343,8 @@ static void Lnut(int x, int y) next[x][y] = Xblank; cave[x+1][y] = Ynut_e; next[x+1][y] = Xnut_pause; + if (cave[x][y+1] == Xbumper) + cave[x][y+1] = Ybumper; return; } } @@ -4959,6 +5400,7 @@ static void Lnut_fall(int x, int y) { switch (cave[x][y+1]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -4970,7 +5412,14 @@ static void Lnut_fall(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: - case Zplayer: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: cave[x][y] = Ynut_sB; next[x][y] = Xblank; cave[x][y+1] = Ynut_s; @@ -5042,10 +5491,6 @@ static void Lspring(int x, int y) play_element_sound(x, y, SOUND_acid, Xacid_1); return; - case Xspring: - case Xspring_pause: - case Xspring_e: - case Xspring_w: case Xandroid: case Xandroid_1_n: case Xandroid_2_n: @@ -5055,23 +5500,20 @@ static void Lspring(int x, int y) case Xandroid_2_s: case Xandroid_1_w: case Xandroid_2_w: - case Xstone: - case Xstone_pause: case Xemerald: case Xemerald_pause: case Xdiamond: case Xdiamond_pause: + case Xstone: + case Xstone_pause: case Xbomb: case Xbomb_pause: - case Xballoon: - case Xacid_ne: - case Xacid_nw: - case Xball_1: - case Xball_2: case Xnut: case Xnut_pause: - case Xslide_ns: - case Xslide_ew: + case Xspring: + case Xspring_pause: + case Xspring_e: + case Xspring_w: case Xkey_1: case Xkey_2: case Xkey_3: @@ -5080,8 +5522,16 @@ static void Lspring(int x, int y) case Xkey_6: case Xkey_7: case Xkey_8: - case Xbumper: + case Xballoon: + case Xball_1: + case Xball_2: case Xswitch: + case Xbumper: + case Ybumper: + case Xacid_ne: + case Xacid_nw: + case Xslide_ns: + case Xslide_ew: case Xroundwall_1: case Xroundwall_2: case Xroundwall_3: @@ -5093,14 +5543,13 @@ static void Lspring(int x, int y) cave[x][y] = Yspring_eB; next[x][y] = Xblank; cave[x+1][y] = Yspring_e; - if (cave[x][y+1] == Xbumper) - cave[x][y+1] = XbumperB; - #ifdef SPRING_ROLL next[x+1][y] = Xspring_e; #else next[x+1][y] = Xspring_pause; #endif + if (cave[x][y+1] == Xbumper) + cave[x][y+1] = Ybumper; return; } @@ -5109,14 +5558,13 @@ static void Lspring(int x, int y) cave[x][y] = Yspring_wB; next[x][y] = Xblank; cave[x-1][y] = Yspring_w; - if (cave[x][y+1] == Xbumper) - cave[x][y+1] = XbumperB; - #ifdef SPRING_ROLL next[x-1][y] = Xspring_w; #else next[x-1][y] = Xspring_pause; #endif + if (cave[x][y+1] == Xbumper) + cave[x][y+1] = Ybumper; return; } } @@ -5127,14 +5575,13 @@ static void Lspring(int x, int y) cave[x][y] = Yspring_wB; next[x][y] = Xblank; cave[x-1][y] = Yspring_w; - if (cave[x][y+1] == Xbumper) - cave[x][y+1] = XbumperB; - #ifdef SPRING_ROLL next[x-1][y] = Xspring_w; #else next[x-1][y] = Xspring_pause; #endif + if (cave[x][y+1] == Xbumper) + cave[x][y+1] = Ybumper; return; } @@ -5143,14 +5590,13 @@ static void Lspring(int x, int y) cave[x][y] = Yspring_eB; next[x][y] = Xblank; cave[x+1][y] = Yspring_e; - if (cave[x][y+1] == Xbumper) - cave[x][y+1] = XbumperB; - #ifdef SPRING_ROLL next[x+1][y] = Xspring_e; #else next[x+1][y] = Xspring_pause; #endif + if (cave[x][y+1] == Xbumper) + cave[x][y+1] = Ybumper; return; } } @@ -5241,7 +5687,7 @@ static void Lspring_e(int x, int y) return; case Xbumper: - cave[x][y+1] = XbumperB; + cave[x][y+1] = Ybumper; } switch (cave[x+1][y]) @@ -5299,8 +5745,8 @@ static void Lspring_e(int x, int y) return; case Xbumper: - case XbumperB: - cave[x+1][y] = XbumperB; + case Ybumper: + cave[x+1][y] = Ybumper; next[x][y] = Xspring_w; play_element_sound(x, y, SOUND_spring, Xspring); return; @@ -5352,7 +5798,7 @@ static void Lspring_w(int x, int y) return; case Xbumper: - cave[x][y+1] = XbumperB; + cave[x][y+1] = Ybumper; } switch (cave[x-1][y]) @@ -5410,8 +5856,8 @@ static void Lspring_w(int x, int y) return; case Xbumper: - case XbumperB: - cave[x-1][y] = XbumperB; + case Ybumper: + cave[x-1][y] = Ybumper; next[x][y] = Xspring_e; play_element_sound(x, y, SOUND_spring, Xspring); return; @@ -5428,6 +5874,7 @@ static void Lspring_fall(int x, int y) { switch (cave[x][y+1]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -5439,7 +5886,14 @@ static void Lspring_fall(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: - case Zplayer: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: cave[x][y] = Yspring_sB; next[x][y] = Xblank; cave[x][y+1] = Yspring_s; @@ -5463,10 +5917,26 @@ static void Lspring_fall(int x, int y) play_element_sound(x, y, SOUND_acid, Xacid_1); return; - case Xbomb: - case Xbomb_pause: - cave[x][y+1] = Ybomb_blank; - Lboom_tank(x, y+1, Xspring_fall); + case Xeater_n: + case Xeater_e: + case Xeater_s: + case Xeater_w: + cave[x][y] = Yspring_sB; + next[x][y] = Xblank; + cave[x][y+1] = Yeater_spring; + next[x][y+1] = Zeater; + Lboom_eater_old(x, y+1); + score += lev.eater_score; + return; + + case Xalien: + case Xalien_pause: + cave[x][y] = Yspring_sB; + next[x][y] = Xblank; + cave[x][y+1] = Yalien_spring; + next[x][y+1] = Ztank; + Lboom_tank_old(x, y+1); + score += lev.alien_score; return; case Xbug_1_n: @@ -5478,8 +5948,10 @@ static void Lspring_fall(int x, int y) case Xbug_2_s: case Xbug_2_w: cave[x][y] = Yspring_sB; + next[x][y] = Xblank; cave[x][y+1] = Ybug_spring; - Lboom_bug(x, y+1, Xspring_fall); + next[x][y+1] = Zbug; + Lboom_bug_old(x, y+1); score += lev.bug_score; return; @@ -5492,27 +5964,20 @@ static void Lspring_fall(int x, int y) case Xtank_2_s: case Xtank_2_w: cave[x][y] = Yspring_sB; + next[x][y] = Xblank; cave[x][y+1] = Ytank_spring; - Lboom_tank(x, y+1, Xspring_fall); + next[x][y+1] = Ztank; + Lboom_tank_old(x, y+1); score += lev.tank_score; return; - case Xeater_n: - case Xeater_e: - case Xeater_s: - case Xeater_w: - cave[x][y] = Yspring_sB; - cave[x][y+1] = Yeater_spring; - Lboom_eater(x, y+1, Xspring_fall); - score += lev.eater_score; - return; - - case Xalien: - case Xalien_pause: - cave[x][y] = Yspring_sB; - cave[x][y+1] = Yalien_spring; - Lboom_tank(x, y+1, Xspring_fall); - score += lev.alien_score; + case Xbomb: + case Xbomb_pause: + cave[x][y] = Xspring; + next[x][y] = Xspring; + cave[x][y+1] = Ybomb_blank; + next[x][y+1] = Ztank; + Lboom_tank_old(x, y+1); return; default: @@ -5525,302 +5990,578 @@ static void Lspring_fall(int x, int y) static void Lpush_emerald_e(int x, int y) { + cave[x][y] = Yemerald_eB; + next[x][y] = Xblank; + switch (cave[x+1][y]) { + case Zplayer: + if (!game_em.use_old_push_elements) + break; case Zborder: - case Znormal: + case Zbug: + case Ztank: + case Zeater: case Zdynamite: + case Zboom: + case Xchain: case Xboom_bug: - case Xboom_bomb: + case Xboom_tank: case Xboom_android: case Xboom_1: - case Zplayer: - cave[x][y] = Xemerald; - next[x][y] = Xemerald; + Lpush_element_old(x, y, Xemerald); return; - default: - cave[x][y] = Yemerald_eB; - next[x][y] = Xblank; - cave[x+1][y] = Yemerald_e; - next[x+1][y] = Xemerald_pause; +#ifdef ACID_ROLL + case Xacid_1: + case Xacid_2: + case Xacid_3: + case Xacid_4: + case Xacid_5: + case Xacid_6: + case Xacid_7: + case Xacid_8: + if (game_em.use_old_push_into_acid) + break; + if (cave[x+2][y-1] == Xblank) + cave[x+2][y-1] = Xsplash_e; + if (cave[x][y-1] == Xblank) + cave[x][y-1] = Xsplash_w; + play_element_sound(x, y, SOUND_acid, Xacid_1); return; +#endif } + + cave[x+1][y] = Yemerald_e; + next[x+1][y] = Xemerald_pause; } static void Lpush_emerald_w(int x, int y) { + cave[x][y] = Yemerald_wB; + next[x][y] = Xblank; + switch (cave[x-1][y]) { + case Zplayer: + if (!game_em.use_old_push_elements) + break; case Zborder: - case Znormal: + case Zbug: + case Ztank: + case Zeater: case Zdynamite: + case Zboom: + case Xchain: case Xboom_bug: - case Xboom_bomb: + case Xboom_tank: case Xboom_android: case Xboom_1: - case Zplayer: - cave[x][y] = Xemerald; - next[x][y] = Xemerald; + Lpush_element_old(x, y, Xemerald); return; - default: - cave[x][y] = Yemerald_wB; - next[x][y] = Xblank; - cave[x-1][y] = Yemerald_w; - next[x-1][y] = Xemerald_pause; +#ifdef ACID_ROLL + case Xacid_1: + case Xacid_2: + case Xacid_3: + case Xacid_4: + case Xacid_5: + case Xacid_6: + case Xacid_7: + case Xacid_8: + if (game_em.use_old_push_into_acid) + break; + if (cave[x][y-1] == Xblank) + cave[x][y-1] = Xsplash_e; + if (cave[x-2][y-1] == Xblank) + cave[x-2][y-1] = Xsplash_w; + play_element_sound(x, y, SOUND_acid, Xacid_1); return; +#endif } + + cave[x-1][y] = Yemerald_w; + next[x-1][y] = Xemerald_pause; } static void Lpush_diamond_e(int x, int y) { + cave[x][y] = Ydiamond_eB; + next[x][y] = Xblank; + switch (cave[x+1][y]) { + case Zplayer: + if (!game_em.use_old_push_elements) + break; case Zborder: - case Znormal: + case Zbug: + case Ztank: + case Zeater: case Zdynamite: + case Zboom: + case Xchain: case Xboom_bug: - case Xboom_bomb: + case Xboom_tank: case Xboom_android: case Xboom_1: - case Zplayer: - cave[x][y] = Xdiamond; - next[x][y] = Xdiamond; + Lpush_element_old(x, y, Xdiamond); return; - default: - cave[x][y] = Ydiamond_eB; - next[x][y] = Xblank; - cave[x+1][y] = Ydiamond_e; - next[x+1][y] = Xdiamond_pause; +#ifdef ACID_ROLL + case Xacid_1: + case Xacid_2: + case Xacid_3: + case Xacid_4: + case Xacid_5: + case Xacid_6: + case Xacid_7: + case Xacid_8: + if (game_em.use_old_push_into_acid) + break; + if (cave[x+2][y-1] == Xblank) + cave[x+2][y-1] = Xsplash_e; + if (cave[x][y-1] == Xblank) + cave[x][y-1] = Xsplash_w; + play_element_sound(x, y, SOUND_acid, Xacid_1); return; +#endif } + + cave[x+1][y] = Ydiamond_e; + next[x+1][y] = Xdiamond_pause; } static void Lpush_diamond_w(int x, int y) { + cave[x][y] = Ydiamond_wB; + next[x][y] = Xblank; + switch (cave[x-1][y]) { + case Zplayer: + if (!game_em.use_old_push_elements) + break; case Zborder: - case Znormal: + case Zbug: + case Ztank: + case Zeater: case Zdynamite: + case Zboom: + case Xchain: case Xboom_bug: - case Xboom_bomb: + case Xboom_tank: case Xboom_android: case Xboom_1: - case Zplayer: - cave[x][y] = Xdiamond; - next[x][y] = Xdiamond; + Lpush_element_old(x, y, Xdiamond); return; - default: - cave[x][y] = Ydiamond_wB; - next[x][y] = Xblank; - cave[x-1][y] = Ydiamond_w; - next[x-1][y] = Xdiamond_pause; +#ifdef ACID_ROLL + case Xacid_1: + case Xacid_2: + case Xacid_3: + case Xacid_4: + case Xacid_5: + case Xacid_6: + case Xacid_7: + case Xacid_8: + if (game_em.use_old_push_into_acid) + break; + if (cave[x][y-1] == Xblank) + cave[x][y-1] = Xsplash_e; + if (cave[x-2][y-1] == Xblank) + cave[x-2][y-1] = Xsplash_w; + play_element_sound(x, y, SOUND_acid, Xacid_1); return; +#endif } + + cave[x-1][y] = Ydiamond_w; + next[x-1][y] = Xdiamond_pause; } static void Lpush_stone_e(int x, int y) { + cave[x][y] = Ystone_eB; + next[x][y] = Xblank; + switch (cave[x+1][y]) { + case Zplayer: + if (!game_em.use_old_push_elements) + break; case Zborder: - case Znormal: + case Zbug: + case Ztank: + case Zeater: case Zdynamite: + case Zboom: + case Xchain: case Xboom_bug: - case Xboom_bomb: + case Xboom_tank: case Xboom_android: case Xboom_1: - case Zplayer: - cave[x][y] = Xstone; - next[x][y] = Xstone; + Lpush_element_old(x, y, Xstone); return; - default: - cave[x][y] = Ystone_eB; - next[x][y] = Xblank; - cave[x+1][y] = Ystone_e; - next[x+1][y] = Xstone_pause; +#ifdef ACID_ROLL + case Xacid_1: + case Xacid_2: + case Xacid_3: + case Xacid_4: + case Xacid_5: + case Xacid_6: + case Xacid_7: + case Xacid_8: + if (game_em.use_old_push_into_acid) + break; + if (cave[x+2][y-1] == Xblank) + cave[x+2][y-1] = Xsplash_e; + if (cave[x][y-1] == Xblank) + cave[x][y-1] = Xsplash_w; + play_element_sound(x, y, SOUND_acid, Xacid_1); return; +#endif } + + cave[x+1][y] = Ystone_e; + next[x+1][y] = Xstone_pause; } static void Lpush_stone_w(int x, int y) { + cave[x][y] = Ystone_wB; + next[x][y] = Xblank; + switch (cave[x-1][y]) { + case Zplayer: + if (!game_em.use_old_push_elements) + break; case Zborder: - case Znormal: + case Zbug: + case Ztank: + case Zeater: case Zdynamite: + case Zboom: + case Xchain: case Xboom_bug: - case Xboom_bomb: + case Xboom_tank: case Xboom_android: case Xboom_1: - case Zplayer: - cave[x][y] = Xstone; - next[x][y] = Xstone; + Lpush_element_old(x, y, Xstone); return; - default: - cave[x][y] = Ystone_wB; - next[x][y] = Xblank; - cave[x-1][y] = Ystone_w; - next[x-1][y] = Xstone_pause; +#ifdef ACID_ROLL + case Xacid_1: + case Xacid_2: + case Xacid_3: + case Xacid_4: + case Xacid_5: + case Xacid_6: + case Xacid_7: + case Xacid_8: + if (game_em.use_old_push_into_acid) + break; + if (cave[x][y-1] == Xblank) + cave[x][y-1] = Xsplash_e; + if (cave[x-2][y-1] == Xblank) + cave[x-2][y-1] = Xsplash_w; + play_element_sound(x, y, SOUND_acid, Xacid_1); return; +#endif } + + cave[x-1][y] = Ystone_w; + next[x-1][y] = Xstone_pause; } static void Lpush_bomb_e(int x, int y) { + cave[x][y] = Ybomb_eB; + next[x][y] = Xblank; + switch (cave[x+1][y]) { + case Zplayer: + if (!game_em.use_old_push_elements) + break; case Zborder: - case Znormal: + case Zbug: + case Ztank: + case Zeater: case Zdynamite: + case Zboom: + case Xchain: case Xboom_bug: - case Xboom_bomb: + case Xboom_tank: case Xboom_android: case Xboom_1: - case Zplayer: - cave[x][y] = Xbomb; - next[x][y] = Xbomb; + Lpush_element_old(x, y, Xbomb); return; - default: - cave[x][y] = Ybomb_eB; - next[x][y] = Xblank; - cave[x+1][y] = Ybomb_e; - next[x+1][y] = Xbomb_pause; +#ifdef ACID_ROLL + case Xacid_1: + case Xacid_2: + case Xacid_3: + case Xacid_4: + case Xacid_5: + case Xacid_6: + case Xacid_7: + case Xacid_8: + if (game_em.use_old_push_into_acid) + break; + if (cave[x+2][y-1] == Xblank) + cave[x+2][y-1] = Xsplash_e; + if (cave[x][y-1] == Xblank) + cave[x][y-1] = Xsplash_w; + play_element_sound(x, y, SOUND_acid, Xacid_1); return; +#endif } + + cave[x+1][y] = Ybomb_e; + next[x+1][y] = Xbomb_pause; } static void Lpush_bomb_w(int x, int y) { + cave[x][y] = Ybomb_wB; + next[x][y] = Xblank; + switch (cave[x-1][y]) { + case Zplayer: + if (!game_em.use_old_push_elements) + break; case Zborder: - case Znormal: + case Zbug: + case Ztank: + case Zeater: case Zdynamite: + case Zboom: + case Xchain: case Xboom_bug: - case Xboom_bomb: + case Xboom_tank: case Xboom_android: case Xboom_1: - case Zplayer: - cave[x][y] = Xbomb; - next[x][y] = Xbomb; + Lpush_element_old(x, y, Xbomb); return; - default: - cave[x][y] = Ybomb_wB; - next[x][y] = Xblank; - cave[x-1][y] = Ybomb_w; - next[x-1][y] = Xbomb_pause; +#ifdef ACID_ROLL + case Xacid_1: + case Xacid_2: + case Xacid_3: + case Xacid_4: + case Xacid_5: + case Xacid_6: + case Xacid_7: + case Xacid_8: + if (game_em.use_old_push_into_acid) + break; + if (cave[x][y-1] == Xblank) + cave[x][y-1] = Xsplash_e; + if (cave[x-2][y-1] == Xblank) + cave[x-2][y-1] = Xsplash_w; + play_element_sound(x, y, SOUND_acid, Xacid_1); return; +#endif } + + cave[x-1][y] = Ybomb_w; + next[x-1][y] = Xbomb_pause; } static void Lpush_nut_e(int x, int y) { + cave[x][y] = Ynut_eB; + next[x][y] = Xblank; + switch (cave[x+1][y]) { + case Zplayer: + if (!game_em.use_old_push_elements) + break; case Zborder: - case Znormal: + case Zbug: + case Ztank: + case Zeater: case Zdynamite: + case Zboom: + case Xchain: case Xboom_bug: - case Xboom_bomb: + case Xboom_tank: case Xboom_android: case Xboom_1: - case Zplayer: - cave[x][y] = Xnut; - next[x][y] = Xnut; + Lpush_element_old(x, y, Xnut); return; - default: - cave[x][y] = Ynut_eB; - next[x][y] = Xblank; - cave[x+1][y] = Ynut_e; - next[x+1][y] = Xnut_pause; +#ifdef ACID_ROLL + case Xacid_1: + case Xacid_2: + case Xacid_3: + case Xacid_4: + case Xacid_5: + case Xacid_6: + case Xacid_7: + case Xacid_8: + if (game_em.use_old_push_into_acid) + break; + if (cave[x+2][y-1] == Xblank) + cave[x+2][y-1] = Xsplash_e; + if (cave[x][y-1] == Xblank) + cave[x][y-1] = Xsplash_w; + play_element_sound(x, y, SOUND_acid, Xacid_1); return; +#endif } + + cave[x+1][y] = Ynut_e; + next[x+1][y] = Xnut_pause; } static void Lpush_nut_w(int x, int y) { + cave[x][y] = Ynut_wB; + next[x][y] = Xblank; + switch (cave[x-1][y]) { + case Zplayer: + if (!game_em.use_old_push_elements) + break; case Zborder: - case Znormal: + case Zbug: + case Ztank: + case Zeater: case Zdynamite: + case Zboom: + case Xchain: case Xboom_bug: - case Xboom_bomb: + case Xboom_tank: case Xboom_android: case Xboom_1: - case Zplayer: - cave[x][y] = Xnut; - next[x][y] = Xnut; + Lpush_element_old(x, y, Xnut); return; - default: - cave[x][y] = Ynut_wB; - next[x][y] = Xblank; - cave[x-1][y] = Ynut_w; - next[x-1][y] = Xnut_pause; +#ifdef ACID_ROLL + case Xacid_1: + case Xacid_2: + case Xacid_3: + case Xacid_4: + case Xacid_5: + case Xacid_6: + case Xacid_7: + case Xacid_8: + if (game_em.use_old_push_into_acid) + break; + if (cave[x][y-1] == Xblank) + cave[x][y-1] = Xsplash_e; + if (cave[x-2][y-1] == Xblank) + cave[x-2][y-1] = Xsplash_w; + play_element_sound(x, y, SOUND_acid, Xacid_1); return; +#endif } + + cave[x-1][y] = Ynut_w; + next[x-1][y] = Xnut_pause; } static void Lpush_spring_e(int x, int y) { + cave[x][y] = Yspring_eB; + next[x][y] = Xblank; + switch (cave[x+1][y]) { + case Zplayer: + if (!game_em.use_old_push_elements) + break; case Zborder: - case Znormal: + case Zbug: + case Ztank: + case Zeater: case Zdynamite: + case Zboom: + case Xchain: case Xboom_bug: - case Xboom_bomb: + case Xboom_tank: case Xboom_android: case Xboom_1: - case Zplayer: - cave[x][y] = Xspring; - next[x][y] = Xspring; + Lpush_element_old(x, y, Xspring); return; - default: - cave[x][y] = Yspring_eB; - next[x][y] = Xblank; - cave[x+1][y] = Yspring_e; - next[x+1][y] = Xspring_e; +#ifdef ACID_ROLL + case Xacid_1: + case Xacid_2: + case Xacid_3: + case Xacid_4: + case Xacid_5: + case Xacid_6: + case Xacid_7: + case Xacid_8: + if (game_em.use_old_push_into_acid) + break; + if (cave[x+2][y-1] == Xblank) + cave[x+2][y-1] = Xsplash_e; + if (cave[x][y-1] == Xblank) + cave[x][y-1] = Xsplash_w; + play_element_sound(x, y, SOUND_acid, Xacid_1); return; +#endif } + + cave[x+1][y] = Yspring_e; + next[x+1][y] = Xspring_e; } static void Lpush_spring_w(int x, int y) { + cave[x][y] = Yspring_wB; + next[x][y] = Xblank; + switch (cave[x-1][y]) { + case Zplayer: + if (!game_em.use_old_push_elements) + break; case Zborder: - case Znormal: + case Zbug: + case Ztank: + case Zeater: case Zdynamite: + case Zboom: + case Xchain: case Xboom_bug: - case Xboom_bomb: + case Xboom_tank: case Xboom_android: case Xboom_1: - case Zplayer: - cave[x][y] = Xspring; - next[x][y] = Xspring; + Lpush_element_old(x, y, Xspring); return; - default: - cave[x][y] = Yspring_wB; - next[x][y] = Xblank; - cave[x-1][y] = Yspring_w; - next[x-1][y] = Xspring_w; +#ifdef ACID_ROLL + case Xacid_1: + case Xacid_2: + case Xacid_3: + case Xacid_4: + case Xacid_5: + case Xacid_6: + case Xacid_7: + case Xacid_8: + if (game_em.use_old_push_into_acid) + break; + if (cave[x][y-1] == Xblank) + cave[x][y-1] = Xsplash_e; + if (cave[x-2][y-1] == Xblank) + cave[x-2][y-1] = Xsplash_w; + play_element_sound(x, y, SOUND_acid, Xacid_1); return; +#endif } + + cave[x-1][y] = Yspring_w; + next[x-1][y] = Xspring_w; } static void Ldynamite_1(int x, int y) @@ -6207,7 +6948,7 @@ static void Lball_common(int x, int y) static void Lball_1(int x, int y) { - if (lev.ball_state == 0) + if (!lev.ball_active) return; cave[x][y] = Yball_1; @@ -6220,7 +6961,7 @@ static void Lball_1(int x, int y) static void Lball_2(int x, int y) { - if (lev.ball_state == 0) + if (!lev.ball_active) return; cave[x][y] = Yball_2; @@ -6242,6 +6983,7 @@ static void Ldrip_fall(int x, int y) switch (cave[x][y+1]) { + case Zplayer: case Xblank: case Xsplash_e: case Xsplash_w: @@ -6253,9 +6995,16 @@ static void Ldrip_fall(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + case Xfake_acid_1_player: + case Xfake_acid_2_player: + case Xfake_acid_3_player: + case Xfake_acid_4_player: + case Xfake_acid_5_player: + case Xfake_acid_6_player: + case Xfake_acid_7_player: + case Xfake_acid_8_player: case Xplant: case Yplant: - case Zplayer: cave[x][y] = Ydrip_1_sB; next[x][y] = Xdrip_stretchB; cave[x][y+1] = Ydrip_1_s; @@ -6313,9 +7062,9 @@ static void Ldrip_stretchB(int x, int y) static void Lwonderwall(int x, int y) { - if (lev.wonderwall_time && lev.wonderwall_state) + if (lev.wonderwall_time > 0 && lev.wonderwall_active) { - cave[x][y] = XwonderwallB; + cave[x][y] = Ywonderwall; play_element_sound(x, y, SOUND_wonder, Xwonderwall); } } @@ -6323,31 +7072,31 @@ static void Lwonderwall(int x, int y) static void Lwheel(int x, int y) { if (lev.wheel_cnt && x == lev.wheel_x && y == lev.wheel_y) - cave[x][y] = XwheelB; + cave[x][y] = Ywheel; } static void Lswitch(int x, int y) { - if (lev.ball_state) - cave[x][y] = XswitchB; + if (lev.ball_active) + cave[x][y] = Yswitch; } static void Lfake_blank(int x, int y) { if (lev.lenses_cnt) - cave[x][y] = Xfake_blankB; + cave[x][y] = Yfake_blank; } static void Lfake_grass(int x, int y) { if (lev.magnify_cnt) - cave[x][y] = Xfake_grassB; + cave[x][y] = Yfake_grass; } static void Lfake_amoeba(int x, int y) { if (lev.lenses_cnt) - cave[x][y] = Xfake_amoebaB; + cave[x][y] = Yfake_amoeba; } static void Lsand_stone(int x, int y) @@ -6513,7 +7262,7 @@ static void Lslide_ew(int x, int y) static void Lexit(int x, int y) { - if (lev.required > 0) + if (lev.gems_needed > 0) return; switch (RANDOM(64) / 21) @@ -6572,11 +7321,11 @@ static void Lamoeba(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: + case Xplant: + case Yplant: case Xgrass: case Xdirt: case Xsand: - case Xplant: - case Yplant: if (is_amoeba[cave[x][y-1]] || is_amoeba[cave[x+1][y]] || is_amoeba[cave[x][y+1]] || @@ -6590,10 +7339,14 @@ static void Lboom_one(int x, int y, boolean by_dynamite) switch (cave[x][y]) { case Zborder: - case Znormal: + case Zbug: + case Ztank: + case Zeater: case Zdynamite: + case Zboom: + case Xchain: case Xboom_bug: - case Xboom_bomb: + case Xboom_tank: case Xboom_android: case Xacid_1: case Xacid_2: @@ -6603,11 +7356,6 @@ static void Lboom_one(int x, int y, boolean by_dynamite) case Xacid_6: case Xacid_7: case Xacid_8: - case Xacid_ne: - case Xacid_nw: - case Xacid_s: - case Xacid_se: - case Xacid_sw: case Xplant: case Yplant: case Xdoor_1: @@ -6626,6 +7374,11 @@ static void Lboom_one(int x, int y, boolean by_dynamite) case Xfake_door_6: case Xfake_door_7: case Xfake_door_8: + case Xacid_ne: + case Xacid_nw: + case Xacid_s: + case Xacid_se: + case Xacid_sw: case Xsteel_1: case Xsteel_2: case Xsteel_3: @@ -6654,12 +7407,14 @@ static void Lboom_one(int x, int y, boolean by_dynamite) case Xbug_2_s: case Xbug_2_w: cave[x][y] = Xboom_bug; + Lboom_bug_new(x, y, TRUE); return; case Xbomb: case Xbomb_pause: case Xbomb_fall: - cave[x][y] = Xboom_bomb; + cave[x][y] = Xboom_tank; + Lboom_tank_new(x, y, TRUE); return; default: @@ -6686,13 +7441,28 @@ static void Lexplode(int x, int y) { switch (cave[x][y]) { - case Znormal: + case Zbug: + Lboom_bug_new(x, y, FALSE); + Lboom_nine(x, y, FALSE); + break; + + case Ztank: + Lboom_tank_new(x, y, FALSE); + Lboom_nine(x, y, FALSE); + break; + + case Zeater: + Lboom_eater_new(x, y, FALSE); Lboom_nine(x, y, FALSE); break; case Zdynamite: Lboom_nine(x, y, TRUE); break; + + case Zboom: + Lboom_nine(x, y, FALSE); + break; } } @@ -6721,6 +7491,11 @@ static void Lboom_android(int x, int y) Lboom_1(x, y); } +static void Lchain(int x, int y) +{ + next[x][y] = Zboom; +} + static void handle_tile(int x, int y) { switch (cave[x][y]) @@ -6880,54 +7655,87 @@ static void handle_tile(int x, int y) case Xpause: Lpause(x, y); break; - case Xboom_bug: Lboom_bug(x, y, Xboom_bug); break; - case Xboom_bomb: Lboom_tank(x, y, Xboom_bomb); break; + case Xchain: Lchain(x, y); break; + case Xboom_bug: Lboom_bug(x, y); break; + case Xboom_tank: Lboom_tank(x, y); break; case Xboom_android: Lboom_android(x, y); break; case Xboom_1: Lboom_1(x, y); break; case Xboom_2: Lboom_2(x, y); break; } } -void logic_players(void) +boolean logic_check_wrap(void) { - int start_check_nr; int i; - cave = lev.cave; - next = lev.next; - boom = lev.boom; - - game_em.any_player_moving = FALSE; - game_em.any_player_snapping = FALSE; - - /* must test for death and actually kill separately */ for (i = 0; i < MAX_PLAYERS; i++) { - boolean ply_kill = player_killed(&ply[i]); + if (!ply[i].alive) + continue; - if (ply[i].alive && ply_kill) - kill_player(&ply[i]); + /* check for wrap-around movement */ + if (ply[i].x < lev.left || + ply[i].x > lev.right - 1) + return TRUE; } + return FALSE; +} + +void logic_move(void) +{ + int i; + for (i = 0; i < MAX_PLAYERS; i++) { + if (!ply[i].alive) + continue; + /* check for wrap-around movement */ if (ply[i].x < lev.left || ply[i].x > lev.right - 1) { ply[i].x = (ply[i].x < lev.left ? lev.right - 1 : lev.left); + if (!lev.infinite_true) + ply[i].y += (ply[i].x == lev.left ? 1 : -1); + game.centered_player_nr_next = i; game.set_centered_player = TRUE; - game.set_centered_player_fast = TRUE; + game.set_centered_player_wrap = TRUE; } - ply[i].oldx = ply[i].x; - ply[i].oldy = ply[i].y; + ply[i].prev_x = ply[i].x; + ply[i].prev_y = ply[i].y; ply[i].anim = PLY_still; } +} + +static void logic_players(void) +{ + int start_check_nr; + int i; + + cave = lev.cave; + next = lev.next; + boom = lev.boom; + + game_em.any_player_moving = FALSE; + game_em.any_player_snapping = FALSE; + + /* must test for death and actually kill separately */ + for (i = 0; i < MAX_PLAYERS; i++) + { + boolean ply_kill = player_killed(&ply[i]); + + if (ply[i].alive && ply_kill) + kill_player(&ply[i]); + } + + logic_move(); - start_check_nr = (RandomEM & 128 ? 0 : 1) * 2 + (RandomEM & 256 ? 0 : 1); + start_check_nr = ((game_em.random & 128 ? 0 : 1) * 2 + + (game_em.random & 256 ? 0 : 1)); for (i = 0; i < MAX_PLAYERS; i++) { @@ -6942,21 +7750,25 @@ void logic_players(void) if (!ply[i].alive) continue; - if (cave[ply[i].oldx][ply[i].oldy] == Zplayer) + if (is_player[cave[ply[i].prev_x][ply[i].prev_y]]) { - cave[ply[i].oldx][ply[i].oldy] = Xblank; - next[ply[i].oldx][ply[i].oldy] = Xblank; + int element = cave[ply[i].prev_x][ply[i].prev_y]; + + cave[ply[i].prev_x][ply[i].prev_y] = remove_player[element]; + next[ply[i].prev_x][ply[i].prev_y] = remove_player[element]; } - if (cave[ply[i].x][ply[i].y] == Xblank) + if (is_blank[cave[ply[i].x][ply[i].y]]) { - cave[ply[i].x][ply[i].y] = Zplayer; - next[ply[i].x][ply[i].y] = Zplayer; + int element = cave[ply[i].x][ply[i].y]; + + cave[ply[i].x][ply[i].y] = add_player[element]; + next[ply[i].x][ply[i].y] = add_player[element]; } } } -void logic_objects(void) +static void logic_objects(void) { int x, y; @@ -6964,7 +7776,7 @@ void logic_objects(void) next = lev.next; boom = lev.boom; - seed = RandomEM; + seed = game_em.random; score = 0; for (y = lev.top; y < lev.bottom; y++) @@ -6976,7 +7788,7 @@ void logic_objects(void) else game_em.game_over = TRUE; - RandomEM = seed; + game_em.random = seed; /* triple buffering */ void *temp = lev.cave; @@ -6985,12 +7797,16 @@ void logic_objects(void) lev.draw = temp; } -void logic_globals(void) +static void logic_globals(void) { int x; int y; int count; - unsigned int random; +#ifdef RANDOM_BUG + uint64_t random; +#else + uint32_t random; +#endif cave = lev.cave; next = lev.next; @@ -7005,7 +7821,7 @@ void logic_globals(void) lev.android_move_cnt = lev.android_move_time; if (lev.android_clone_cnt-- == 0) lev.android_clone_cnt = lev.android_clone_time; - if (lev.ball_state) + if (lev.ball_active) if (lev.ball_cnt-- == 0) lev.ball_cnt = lev.ball_time; if (lev.lenses_cnt) @@ -7016,7 +7832,7 @@ void logic_globals(void) lev.wheel_cnt--; if (lev.wind_cnt) lev.wind_cnt--; - if (lev.wonderwall_time && lev.wonderwall_state) + if (lev.wonderwall_time > 0 && lev.wonderwall_active) lev.wonderwall_time--; if (lev.wheel_cnt) @@ -7024,7 +7840,7 @@ void logic_globals(void) /* grow amoeba */ - random = RandomEM; + random = game_em.random; for (count = lev.amoeba_time; count--;) { @@ -7036,9 +7852,14 @@ void logic_globals(void) Lamoeba(x, y); random = random * 129 + 1; + +#ifdef RANDOM_BUG + if (!game_em.use_random_bug) + random = (uint32_t)random; +#endif } - RandomEM = random; + game_em.random = random; /* handle explosions */ @@ -7052,3 +7873,25 @@ void logic_globals(void) for (x = lev.left; x < lev.right; x++) next[x][y] = cave[x][y]; } + +void logic_init(void) +{ + int splash_is_blank = !game_em.use_old_android; + + is_android_blank[Xsplash_e] = splash_is_blank; + is_android_blank[Xsplash_w] = splash_is_blank; +} + +void logic(void) +{ + if (frame == 0) + { + logic_players(); + logic_objects(); + } + + if (frame == 1) + { + logic_globals(); + } +}