X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Flogic.c;h=1eaefcfc93421c0303f66dd66f7792a73c202206;hb=36b3c94a39f40ced6b0c3fed7ca40c21a2753a04;hp=f50d93eff4e859888a5f7e3f21a0f8e7f1dc96a8;hpb=48ee370021a7301ff5e087fcbcf0cf426ce0380c;p=rocksndiamonds.git diff --git a/src/game_em/logic.c b/src/game_em/logic.c index f50d93ef..1eaefcfc 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; @@ -263,6 +394,14 @@ static boolean player_killed(struct PLAYER *ply) 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 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); @@ -2271,6 +2419,14 @@ 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: cave[x][y] = Yeater_nB; @@ -2351,6 +2507,14 @@ 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: cave[x][y] = Yeater_eB; @@ -2431,6 +2595,14 @@ 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: cave[x][y] = Yeater_sB; @@ -2511,6 +2683,14 @@ 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: cave[x][y] = Yeater_wB; @@ -2575,6 +2755,14 @@ 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: cave[x][y] = Yalien_nB; @@ -2618,6 +2806,14 @@ 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: cave[x][y] = Yalien_sB; @@ -2664,6 +2860,14 @@ 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: cave[x][y] = Yalien_eB; @@ -2707,6 +2911,14 @@ 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: cave[x][y] = Yalien_wB; @@ -2758,6 +2970,14 @@ 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: cave[x][y] = Ybug_nB; @@ -2799,7 +3019,8 @@ 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; } @@ -2818,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: @@ -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; } @@ -2870,6 +3100,14 @@ 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: cave[x][y] = Ybug_eB; @@ -2911,7 +3149,8 @@ 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; } @@ -2930,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: @@ -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; } @@ -2982,6 +3230,14 @@ 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: cave[x][y] = Ybug_sB; @@ -3023,7 +3279,8 @@ 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; } @@ -3042,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: @@ -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; } @@ -3094,6 +3360,14 @@ 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: cave[x][y] = Ybug_wB; @@ -3135,7 +3409,8 @@ 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; } @@ -3154,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: @@ -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; } @@ -3206,6 +3490,14 @@ 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: cave[x][y] = Ytank_nB; @@ -3247,7 +3539,8 @@ 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; } @@ -3266,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: @@ -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; } @@ -3318,6 +3620,14 @@ 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: cave[x][y] = Ytank_eB; @@ -3359,7 +3669,8 @@ 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; } @@ -3378,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: @@ -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; } @@ -3430,6 +3750,14 @@ 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: cave[x][y] = Ytank_sB; @@ -3471,7 +3799,8 @@ 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; } @@ -3490,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: @@ -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; } @@ -3542,6 +3880,14 @@ 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: cave[x][y] = Ytank_wB; @@ -3583,7 +3929,8 @@ 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; } @@ -3602,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: @@ -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; } @@ -3713,6 +4069,7 @@ static void Lemerald(int x, int y) case Xwonderwall: case Xswitch: case Xbumper: + case Ybumper: case Xacid_ne: case Xacid_nw: case Xslide_ns: @@ -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; } } @@ -3842,6 +4207,14 @@ static void Lemerald_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: cave[x][y] = Yemerald_sB; next[x][y] = Xblank; cave[x][y+1] = Yemerald_s; @@ -3866,9 +4239,9 @@ 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]]) @@ -3963,6 +4336,7 @@ static void Ldiamond(int x, int y) case Xwonderwall: case Xswitch: case Xbumper: + case Ybumper: case Xacid_ne: case Xacid_nw: case Xslide_ns: @@ -3987,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; } @@ -3996,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; } } @@ -4007,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; } @@ -4016,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; } } @@ -4092,6 +4474,14 @@ static void Ldiamond_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: cave[x][y] = Ydiamond_sB; next[x][y] = Xblank; cave[x][y+1] = Ydiamond_s; @@ -4116,9 +4506,9 @@ 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]]) @@ -4221,6 +4611,7 @@ static void Lstone(int x, int y) case Xball_2: case Xswitch: case Xbumper: + case Ybumper: case Xacid_ne: case Xacid_nw: case Xlenses: @@ -4239,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; } @@ -4248,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; } } @@ -4259,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; } @@ -4268,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; } } @@ -4335,6 +4734,14 @@ static void Lstone_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: cave[x][y] = Ystone_sB; next[x][y] = Xblank; cave[x][y+1] = Ystone_s; @@ -4363,16 +4770,20 @@ static void Lstone_fall(int x, int y) case Xeater_s: case Xeater_w: cave[x][y] = Ystone_sB; + Lboom_next_new(x, y, Xblank); cave[x][y+1] = Yeater_stone; - Lboom_eater(x, y+1, Xstone_fall); + 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; - Lboom_tank(x, y+1, Xstone_fall); + next[x][y+1] = Ztank; + Lboom_tank_old(x, y+1); score += lev.alien_score; return; @@ -4385,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; @@ -4399,8 +4812,10 @@ 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; @@ -4420,6 +4835,14 @@ static void Lstone_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 Xacid_1: @@ -4476,8 +4899,11 @@ static void Lstone_fall(int x, int y) case Xbomb: case Xbomb_pause: + Lboom_cave_new(x, y, Xstone); + Lboom_next_new(x, y, Xstone); cave[x][y+1] = Ybomb_blank; - Lboom_tank(x, y+1, Xstone_fall); + next[x][y+1] = Ztank; + Lboom_tank_old(x, y+1); return; case Xnut: @@ -4544,9 +4970,9 @@ static void Lstone_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] = Ystone_sB; next[x][y] = Xblank; if (is_blank[cave[x][y+2]]) @@ -4640,6 +5066,7 @@ static void Lbomb(int x, int y) case Xball_2: case Xswitch: case Xbumper: + case Ybumper: case Xacid_ne: case Xacid_nw: case Xslide_ns: @@ -4656,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; } @@ -4665,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; } } @@ -4676,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; } @@ -4685,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; } } @@ -4776,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; } } @@ -4855,6 +5291,7 @@ static void Lnut(int x, int y) case Xball_2: case Xswitch: case Xbumper: + case Ybumper: case Xacid_ne: case Xacid_nw: case Xslide_ns: @@ -4871,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; } @@ -4880,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; } } @@ -4891,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; } @@ -4900,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; } } @@ -4967,6 +5412,14 @@ static void Lnut_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: cave[x][y] = Ynut_sB; next[x][y] = Xblank; cave[x][y+1] = Ynut_s; @@ -5074,6 +5527,7 @@ static void Lspring(int x, int y) case Xball_2: case Xswitch: case Xbumper: + case Ybumper: case Xacid_ne: case Xacid_nw: case Xslide_ns: @@ -5089,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; } @@ -5105,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; } } @@ -5123,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; } @@ -5139,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; } } @@ -5237,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]) @@ -5295,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; @@ -5348,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]) @@ -5406,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; @@ -5436,6 +5886,14 @@ static void Lspring_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: cave[x][y] = Yspring_sB; next[x][y] = Xblank; cave[x][y+1] = Yspring_s; @@ -5464,16 +5922,20 @@ static void Lspring_fall(int x, int y) case Xeater_s: case Xeater_w: cave[x][y] = Yspring_sB; + next[x][y] = Xblank; cave[x][y+1] = Yeater_spring; - Lboom_eater(x, y+1, Xspring_fall); + 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; - Lboom_tank(x, y+1, Xspring_fall); + next[x][y+1] = Ztank; + Lboom_tank_old(x, y+1); score += lev.alien_score; return; @@ -5486,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; @@ -5500,15 +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 Xbomb: case Xbomb_pause: + cave[x][y] = Xspring; + next[x][y] = Xspring; cave[x][y+1] = Ybomb_blank; - Lboom_tank(x, y+1, Xspring_fall); + next[x][y+1] = Ztank; + Lboom_tank_old(x, y+1); return; default: @@ -5521,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: - 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: - 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: - 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: - 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: - 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: - 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: - 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: - 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: - 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: - 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: - 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: - 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) @@ -6203,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; @@ -6216,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; @@ -6250,6 +6995,14 @@ 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: cave[x][y] = Ydrip_1_sB; @@ -6309,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); } } @@ -6319,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) @@ -6509,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) @@ -6586,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: @@ -6650,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: @@ -6682,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; } } @@ -6717,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]) @@ -6876,54 +7655,89 @@ 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); + int direction = (ply[i].x < lev.left ? -1 : 1); + + ply[i].x += -direction * lev.width; + + if (!lev.infinite_true) + ply[i].y += direction; 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++) { @@ -6938,21 +7752,37 @@ 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]; } } + + /* check for wheel at wrap-around position */ + if (lev.wheel_x < lev.left || + lev.wheel_x > lev.right - 1) + { + int direction = (lev.wheel_x < lev.left ? -1 : 1); + + lev.wheel_x += -direction * lev.width; + + if (!lev.infinite_true) + lev.wheel_y += direction; + } } -void logic_objects(void) +static void logic_objects(void) { int x, y; @@ -6960,7 +7790,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++) @@ -6972,7 +7802,7 @@ void logic_objects(void) else game_em.game_over = TRUE; - RandomEM = seed; + game_em.random = seed; /* triple buffering */ void *temp = lev.cave; @@ -6981,12 +7811,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; @@ -7001,7 +7835,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) @@ -7012,7 +7846,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) @@ -7020,7 +7854,7 @@ void logic_globals(void) /* grow amoeba */ - random = RandomEM; + random = game_em.random; for (count = lev.amoeba_time; count--;) { @@ -7032,9 +7866,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 */ @@ -7048,3 +7887,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(); + } +}