X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Flogic.c;h=7840734eaa75235a2d3a6b977be4b3f39c0ddf1e;hb=63539da7f2d5e1ca071f0e4a9d897df0595d6ae5;hp=f4968eed725dda990023b36aef1f7c7820be4293;hpb=038fb64da88a05a91c974dc1e3b14cf4cdc69743;p=rocksndiamonds.git diff --git a/src/game_em/logic.c b/src/game_em/logic.c index f4968eed..7840734e 100644 --- a/src/game_em/logic.c +++ b/src/game_em/logic.c @@ -10,11 +10,9 @@ #define SPRING_ROLL /* spring rolling off round things continues to roll */ #define ACID_ROLL /* rolling objects go into acid rather than remove it */ +#define ACID_PLAYER /* player gets killed by acid, but without explosion */ -#define USE_CHANGED_ACID_STUFF - -#define RANDOM_RAW (seed = seed << 31 | seed >> 1) -#define RANDOM(x) (RANDOM_RAW & (x - 1)) +#define RANDOM(x) ((seed = seed << 31 | seed >> 1) % x) static short **cave, **next, **boom; static unsigned int seed; @@ -84,6 +82,21 @@ static const byte is_amoeba[GAME_TILE_MAX] = [Xamoeba_8] = 1 }; +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, @@ -152,7 +165,7 @@ static void Lboom_eater(int x, int y) 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) % 8; #if PLAY_ELEMENT_SOUND play_element_sound(x, y, SOUND_boom, Xeater_n); @@ -216,6 +229,31 @@ static void Lboom_eater_new(int x, int y, boolean chain_explosion) 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; @@ -467,7 +505,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: @@ -501,7 +539,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]; @@ -513,6 +551,8 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xsplash_w: cave[x][y] = Zplayer; next[x][y] = Zplayer; + // FALL THROUGH + case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -527,7 +567,6 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) ply->y = y; break; -#ifdef USE_CHANGED_ACID_STUFF case Xacid_1: case Xacid_2: case Xacid_3: @@ -536,13 +575,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: @@ -561,17 +601,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; @@ -1136,7 +1165,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: @@ -1290,6 +1319,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; } @@ -1357,7 +1391,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; } @@ -1365,7 +1402,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) { @@ -1387,11 +1424,15 @@ static void check_player(struct PLAYER *ply) 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 */ - if (ply->joy_snap == 0) /* player wants to move */ + if (!ply->joy_snap) /* player wants to move */ { boolean moved = FALSE; @@ -1536,14 +1577,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)) @@ -1647,91 +1688,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; } } @@ -3961,9 +4002,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]]) @@ -4220,9 +4261,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]]) @@ -4476,7 +4517,7 @@ static void Lstone_fall(int x, int y) case Xeater_s: case Xeater_w: cave[x][y] = Ystone_sB; - next[x][y] = Xblank; + Lboom_next_new(x, y, Xblank); cave[x][y+1] = Yeater_stone; next[x][y+1] = Zeater; Lboom_eater_old(x, y+1); @@ -4486,7 +4527,7 @@ static void Lstone_fall(int x, int y) case Xalien: case Xalien_pause: cave[x][y] = Ystone_sB; - next[x][y] = Xblank; + Lboom_next_new(x, y, Xblank); cave[x][y+1] = Yalien_stone; next[x][y+1] = Ztank; Lboom_tank_old(x, y+1); @@ -4502,7 +4543,7 @@ static void Lstone_fall(int x, int y) case Xbug_2_s: case Xbug_2_w: cave[x][y] = Ystone_sB; - next[x][y] = Xblank; + Lboom_next_new(x, y, Xblank); cave[x][y+1] = Ybug_stone; next[x][y+1] = Zbug; Lboom_bug_old(x, y+1); @@ -4518,7 +4559,7 @@ static void Lstone_fall(int x, int y) case Xtank_2_s: case Xtank_2_w: cave[x][y] = Ystone_sB; - next[x][y] = Xblank; + Lboom_next_new(x, y, Xblank); cave[x][y+1] = Ytank_stone; next[x][y+1] = Ztank; Lboom_tank_old(x, y+1); @@ -4597,8 +4638,8 @@ static void Lstone_fall(int x, int y) case Xbomb: case Xbomb_pause: - cave[x][y] = Xstone; - next[x][y] = Xstone; + 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); @@ -4668,9 +4709,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]]) @@ -5677,6 +5718,9 @@ static void Lpush_emerald_e(int x, int y) switch (cave[x+1][y]) { + case Zplayer: + if (!game_em.use_old_push_elements) + break; case Zborder: case Zbug: case Ztank: @@ -5688,6 +5732,7 @@ static void Lpush_emerald_e(int x, int y) case Xboom_tank: case Xboom_android: case Xboom_1: + Lpush_element_old(x, y, Xemerald); return; #ifdef ACID_ROLL @@ -5719,6 +5764,9 @@ static void Lpush_emerald_w(int x, int y) switch (cave[x-1][y]) { + case Zplayer: + if (!game_em.use_old_push_elements) + break; case Zborder: case Zbug: case Ztank: @@ -5730,6 +5778,7 @@ static void Lpush_emerald_w(int x, int y) case Xboom_tank: case Xboom_android: case Xboom_1: + Lpush_element_old(x, y, Xemerald); return; #ifdef ACID_ROLL @@ -5761,6 +5810,9 @@ static void Lpush_diamond_e(int x, int y) switch (cave[x+1][y]) { + case Zplayer: + if (!game_em.use_old_push_elements) + break; case Zborder: case Zbug: case Ztank: @@ -5772,6 +5824,7 @@ static void Lpush_diamond_e(int x, int y) case Xboom_tank: case Xboom_android: case Xboom_1: + Lpush_element_old(x, y, Xdiamond); return; #ifdef ACID_ROLL @@ -5803,6 +5856,9 @@ static void Lpush_diamond_w(int x, int y) switch (cave[x-1][y]) { + case Zplayer: + if (!game_em.use_old_push_elements) + break; case Zborder: case Zbug: case Ztank: @@ -5814,6 +5870,7 @@ static void Lpush_diamond_w(int x, int y) case Xboom_tank: case Xboom_android: case Xboom_1: + Lpush_element_old(x, y, Xdiamond); return; #ifdef ACID_ROLL @@ -5845,6 +5902,9 @@ static void Lpush_stone_e(int x, int y) switch (cave[x+1][y]) { + case Zplayer: + if (!game_em.use_old_push_elements) + break; case Zborder: case Zbug: case Ztank: @@ -5856,6 +5916,7 @@ static void Lpush_stone_e(int x, int y) case Xboom_tank: case Xboom_android: case Xboom_1: + Lpush_element_old(x, y, Xstone); return; #ifdef ACID_ROLL @@ -5887,6 +5948,9 @@ static void Lpush_stone_w(int x, int y) switch (cave[x-1][y]) { + case Zplayer: + if (!game_em.use_old_push_elements) + break; case Zborder: case Zbug: case Ztank: @@ -5898,6 +5962,7 @@ static void Lpush_stone_w(int x, int y) case Xboom_tank: case Xboom_android: case Xboom_1: + Lpush_element_old(x, y, Xstone); return; #ifdef ACID_ROLL @@ -5929,6 +5994,9 @@ static void Lpush_bomb_e(int x, int y) switch (cave[x+1][y]) { + case Zplayer: + if (!game_em.use_old_push_elements) + break; case Zborder: case Zbug: case Ztank: @@ -5940,6 +6008,7 @@ static void Lpush_bomb_e(int x, int y) case Xboom_tank: case Xboom_android: case Xboom_1: + Lpush_element_old(x, y, Xbomb); return; #ifdef ACID_ROLL @@ -5971,6 +6040,9 @@ static void Lpush_bomb_w(int x, int y) switch (cave[x-1][y]) { + case Zplayer: + if (!game_em.use_old_push_elements) + break; case Zborder: case Zbug: case Ztank: @@ -5982,6 +6054,7 @@ static void Lpush_bomb_w(int x, int y) case Xboom_tank: case Xboom_android: case Xboom_1: + Lpush_element_old(x, y, Xbomb); return; #ifdef ACID_ROLL @@ -6013,6 +6086,9 @@ static void Lpush_nut_e(int x, int y) switch (cave[x+1][y]) { + case Zplayer: + if (!game_em.use_old_push_elements) + break; case Zborder: case Zbug: case Ztank: @@ -6024,6 +6100,7 @@ static void Lpush_nut_e(int x, int y) case Xboom_tank: case Xboom_android: case Xboom_1: + Lpush_element_old(x, y, Xnut); return; #ifdef ACID_ROLL @@ -6055,6 +6132,9 @@ static void Lpush_nut_w(int x, int y) switch (cave[x-1][y]) { + case Zplayer: + if (!game_em.use_old_push_elements) + break; case Zborder: case Zbug: case Ztank: @@ -6066,6 +6146,7 @@ static void Lpush_nut_w(int x, int y) case Xboom_tank: case Xboom_android: case Xboom_1: + Lpush_element_old(x, y, Xnut); return; #ifdef ACID_ROLL @@ -6097,6 +6178,9 @@ static void Lpush_spring_e(int x, int y) switch (cave[x+1][y]) { + case Zplayer: + if (!game_em.use_old_push_elements) + break; case Zborder: case Zbug: case Ztank: @@ -6108,6 +6192,7 @@ static void Lpush_spring_e(int x, int y) case Xboom_tank: case Xboom_android: case Xboom_1: + Lpush_element_old(x, y, Xspring); return; #ifdef ACID_ROLL @@ -6139,6 +6224,9 @@ static void Lpush_spring_w(int x, int y) switch (cave[x-1][y]) { + case Zplayer: + if (!game_em.use_old_push_elements) + break; case Zborder: case Zbug: case Ztank: @@ -6150,6 +6238,7 @@ static void Lpush_spring_w(int x, int y) case Xboom_tank: case Xboom_android: case Xboom_1: + Lpush_element_old(x, y, Xspring); return; #ifdef ACID_ROLL @@ -6558,7 +6647,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; @@ -6571,7 +6660,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; @@ -6664,7 +6753,7 @@ 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] = Ywonderwall; play_element_sound(x, y, SOUND_wonder, Xwonderwall); @@ -6679,7 +6768,7 @@ static void Lwheel(int x, int y) static void Lswitch(int x, int y) { - if (lev.ball_state) + if (lev.ball_active) cave[x][y] = Yswitch; } @@ -7387,7 +7476,7 @@ static 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) @@ -7398,7 +7487,7 @@ static 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) @@ -7435,6 +7524,14 @@ static void logic_globals(void) 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)