X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Flogic.c;h=bfb387f468727b5dce51e57b2e766b8de5b69593;hb=9e073e68375e021ce34c7b7ccef33ee769dcaf03;hp=3c68bfb9f73ea6250de9abf3ef47b29ec65ad8a1;hpb=6eaf8f1f31cd229a7315063f4434389d00aa5cff;p=rocksndiamonds.git diff --git a/src/game_em/logic.c b/src/game_em/logic.c index 3c68bfb9..bfb387f4 100644 --- a/src/game_em/logic.c +++ b/src/game_em/logic.c @@ -12,6 +12,8 @@ #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_BUG /* handle problem with old tapes using 64-bit random */ + #define RANDOM(x) ((seed = seed << 31 | seed >> 1) % x) static short **cave, **next, **boom; @@ -56,16 +58,45 @@ static const byte is_blank_or_acid[GAME_TILE_MAX] = [Xacid_8] = 1 }; -static const byte is_fake_acid[GAME_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 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] = @@ -165,7 +196,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) % 8; + lev.eater_pos = (lev.eater_pos + 1) % lev.num_eater_arrays; #if PLAY_ELEMENT_SOUND play_element_sound(x, y, SOUND_boom, Xeater_n); @@ -245,6 +276,15 @@ static void Lboom_next_new(int x, int y, int element) 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; @@ -354,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: @@ -540,10 +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; - // FALL THROUGH - case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -552,6 +596,9 @@ 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; @@ -1103,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; @@ -1771,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); @@ -2373,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; @@ -2453,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; @@ -2533,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; @@ -2613,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; @@ -2677,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; @@ -2720,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; @@ -2766,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; @@ -2809,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; @@ -2860,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; @@ -2921,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: @@ -2974,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; @@ -3035,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: @@ -3088,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; @@ -3149,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: @@ -3202,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; @@ -3263,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: @@ -3316,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; @@ -3377,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: @@ -3430,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; @@ -3491,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: @@ -3544,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; @@ -3605,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: @@ -3658,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; @@ -3719,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: @@ -3969,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; @@ -4228,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; @@ -4480,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; @@ -4573,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: @@ -5142,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; @@ -5608,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; @@ -5709,6 +5995,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: @@ -5720,6 +6009,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 @@ -5731,6 +6021,8 @@ static void Lpush_emerald_e(int x, int y) 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) @@ -5751,6 +6043,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: @@ -5762,6 +6057,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 @@ -5773,6 +6069,8 @@ static void Lpush_emerald_w(int x, int y) 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) @@ -5793,6 +6091,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: @@ -5804,6 +6105,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 @@ -5815,6 +6117,8 @@ static void Lpush_diamond_e(int x, int y) 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) @@ -5835,6 +6139,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: @@ -5846,6 +6153,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 @@ -5857,6 +6165,8 @@ static void Lpush_diamond_w(int x, int y) 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) @@ -5877,6 +6187,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: @@ -5888,6 +6201,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 @@ -5899,6 +6213,8 @@ static void Lpush_stone_e(int x, int y) 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) @@ -5919,6 +6235,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: @@ -5930,6 +6249,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 @@ -5941,6 +6261,8 @@ static void Lpush_stone_w(int x, int y) 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) @@ -5961,6 +6283,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: @@ -5972,6 +6297,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 @@ -5983,6 +6309,8 @@ static void Lpush_bomb_e(int x, int y) 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) @@ -6003,6 +6331,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: @@ -6014,6 +6345,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 @@ -6025,6 +6357,8 @@ static void Lpush_bomb_w(int x, int y) 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) @@ -6045,6 +6379,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: @@ -6056,6 +6393,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 @@ -6067,6 +6405,8 @@ static void Lpush_nut_e(int x, int y) 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) @@ -6087,6 +6427,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: @@ -6098,6 +6441,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 @@ -6109,6 +6453,8 @@ static void Lpush_nut_w(int x, int y) 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) @@ -6129,6 +6475,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: @@ -6140,6 +6489,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 @@ -6151,6 +6501,8 @@ static void Lpush_spring_e(int x, int y) 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) @@ -6171,6 +6523,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: @@ -6182,6 +6537,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 @@ -6193,6 +6549,8 @@ static void Lpush_spring_w(int x, int y) 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) @@ -6637,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; @@ -7298,27 +7664,28 @@ static void handle_tile(int x, int y) } } -static 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) @@ -7330,6 +7697,9 @@ static void logic_players(void) { 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_wrap = TRUE; @@ -7339,6 +7709,30 @@ static void logic_players(void) 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 = ((game_em.random & 128 ? 0 : 1) * 2 + (game_em.random & 256 ? 0 : 1)); @@ -7356,16 +7750,20 @@ static void logic_players(void) if (!ply[i].alive) continue; - if (cave[ply[i].prev_x][ply[i].prev_y] == Zplayer) + if (is_player[cave[ply[i].prev_x][ply[i].prev_y]]) { - cave[ply[i].prev_x][ply[i].prev_y] = Xblank; - next[ply[i].prev_x][ply[i].prev_y] = 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]; } } } @@ -7404,7 +7802,11 @@ 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; @@ -7450,6 +7852,11 @@ static 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 } game_em.random = random;