#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;
[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] =
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);
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;
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:
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:
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;
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;
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);
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;
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;
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;
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;
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;
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;
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;
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;
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;
case Xfake_acid_6:
case Xfake_acid_7:
case Xfake_acid_8:
+ case Xfake_acid_1_player:
+ case Xfake_acid_2_player:
+ case Xfake_acid_3_player:
+ case Xfake_acid_4_player:
+ case Xfake_acid_5_player:
+ case Xfake_acid_6_player:
+ case Xfake_acid_7_player:
+ case Xfake_acid_8_player:
case Xplant:
case Yplant:
case Xacid_1:
case 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;
case Xfake_acid_6:
case Xfake_acid_7:
case Xfake_acid_8:
+ case Xfake_acid_1_player:
+ case Xfake_acid_2_player:
+ case Xfake_acid_3_player:
+ case Xfake_acid_4_player:
+ case Xfake_acid_5_player:
+ case Xfake_acid_6_player:
+ case Xfake_acid_7_player:
+ case Xfake_acid_8_player:
case Xplant:
case Yplant:
case Xacid_1:
case 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;
case Xfake_acid_6:
case Xfake_acid_7:
case Xfake_acid_8:
+ case Xfake_acid_1_player:
+ case Xfake_acid_2_player:
+ case Xfake_acid_3_player:
+ case Xfake_acid_4_player:
+ case Xfake_acid_5_player:
+ case Xfake_acid_6_player:
+ case Xfake_acid_7_player:
+ case Xfake_acid_8_player:
case Xplant:
case Yplant:
case Xacid_1:
case 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;
case Xfake_acid_6:
case Xfake_acid_7:
case Xfake_acid_8:
+ case Xfake_acid_1_player:
+ case Xfake_acid_2_player:
+ case Xfake_acid_3_player:
+ case Xfake_acid_4_player:
+ case Xfake_acid_5_player:
+ case Xfake_acid_6_player:
+ case Xfake_acid_7_player:
+ case Xfake_acid_8_player:
case Xplant:
case Yplant:
case Xacid_1:
case 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;
case Xfake_acid_6:
case Xfake_acid_7:
case Xfake_acid_8:
+ case Xfake_acid_1_player:
+ case Xfake_acid_2_player:
+ case Xfake_acid_3_player:
+ case Xfake_acid_4_player:
+ case Xfake_acid_5_player:
+ case Xfake_acid_6_player:
+ case Xfake_acid_7_player:
+ case Xfake_acid_8_player:
case Xplant:
case Yplant:
case Xacid_1:
case 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;
case Xfake_acid_6:
case Xfake_acid_7:
case Xfake_acid_8:
+ case Xfake_acid_1_player:
+ case Xfake_acid_2_player:
+ case Xfake_acid_3_player:
+ case Xfake_acid_4_player:
+ case Xfake_acid_5_player:
+ case Xfake_acid_6_player:
+ case Xfake_acid_7_player:
+ case Xfake_acid_8_player:
case Xplant:
case Yplant:
case Xacid_1:
case 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;
case Xfake_acid_6:
case Xfake_acid_7:
case Xfake_acid_8:
+ case Xfake_acid_1_player:
+ case Xfake_acid_2_player:
+ case Xfake_acid_3_player:
+ case Xfake_acid_4_player:
+ case Xfake_acid_5_player:
+ case Xfake_acid_6_player:
+ case Xfake_acid_7_player:
+ case Xfake_acid_8_player:
case Xplant:
case Yplant:
case Xacid_1:
case 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;
case Xfake_acid_6:
case Xfake_acid_7:
case Xfake_acid_8:
+ case Xfake_acid_1_player:
+ case Xfake_acid_2_player:
+ case Xfake_acid_3_player:
+ case Xfake_acid_4_player:
+ case Xfake_acid_5_player:
+ case Xfake_acid_6_player:
+ case Xfake_acid_7_player:
+ case Xfake_acid_8_player:
case Xplant:
case Yplant:
case Xacid_1:
case 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;
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;
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;
case Xfake_acid_6:
case Xfake_acid_7:
case Xfake_acid_8:
+ case Xfake_acid_1_player:
+ case Xfake_acid_2_player:
+ case Xfake_acid_3_player:
+ case Xfake_acid_4_player:
+ case Xfake_acid_5_player:
+ case Xfake_acid_6_player:
+ case Xfake_acid_7_player:
+ case Xfake_acid_8_player:
case Xplant:
case Yplant:
case Xacid_1:
case 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;
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;
switch (cave[x+1][y])
{
+ case Zplayer:
+ if (!game_em.use_old_push_elements)
+ break;
case Zborder:
case Zbug:
case Ztank:
case Xboom_tank:
case Xboom_android:
case Xboom_1:
+ Lpush_element_old(x, y, Xemerald);
return;
#ifdef ACID_ROLL
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)
switch (cave[x-1][y])
{
+ case Zplayer:
+ if (!game_em.use_old_push_elements)
+ break;
case Zborder:
case Zbug:
case Ztank:
case Xboom_tank:
case Xboom_android:
case Xboom_1:
+ Lpush_element_old(x, y, Xemerald);
return;
#ifdef ACID_ROLL
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)
switch (cave[x+1][y])
{
+ case Zplayer:
+ if (!game_em.use_old_push_elements)
+ break;
case Zborder:
case Zbug:
case Ztank:
case Xboom_tank:
case Xboom_android:
case Xboom_1:
+ Lpush_element_old(x, y, Xdiamond);
return;
#ifdef ACID_ROLL
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)
switch (cave[x-1][y])
{
+ case Zplayer:
+ if (!game_em.use_old_push_elements)
+ break;
case Zborder:
case Zbug:
case Ztank:
case Xboom_tank:
case Xboom_android:
case Xboom_1:
+ Lpush_element_old(x, y, Xdiamond);
return;
#ifdef ACID_ROLL
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)
switch (cave[x+1][y])
{
+ case Zplayer:
+ if (!game_em.use_old_push_elements)
+ break;
case Zborder:
case Zbug:
case Ztank:
case Xboom_tank:
case Xboom_android:
case Xboom_1:
+ Lpush_element_old(x, y, Xstone);
return;
#ifdef ACID_ROLL
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)
switch (cave[x-1][y])
{
+ case Zplayer:
+ if (!game_em.use_old_push_elements)
+ break;
case Zborder:
case Zbug:
case Ztank:
case Xboom_tank:
case Xboom_android:
case Xboom_1:
+ Lpush_element_old(x, y, Xstone);
return;
#ifdef ACID_ROLL
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)
switch (cave[x+1][y])
{
+ case Zplayer:
+ if (!game_em.use_old_push_elements)
+ break;
case Zborder:
case Zbug:
case Ztank:
case Xboom_tank:
case Xboom_android:
case Xboom_1:
+ Lpush_element_old(x, y, Xbomb);
return;
#ifdef ACID_ROLL
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)
switch (cave[x-1][y])
{
+ case Zplayer:
+ if (!game_em.use_old_push_elements)
+ break;
case Zborder:
case Zbug:
case Ztank:
case Xboom_tank:
case Xboom_android:
case Xboom_1:
+ Lpush_element_old(x, y, Xbomb);
return;
#ifdef ACID_ROLL
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)
switch (cave[x+1][y])
{
+ case Zplayer:
+ if (!game_em.use_old_push_elements)
+ break;
case Zborder:
case Zbug:
case Ztank:
case Xboom_tank:
case Xboom_android:
case Xboom_1:
+ Lpush_element_old(x, y, Xnut);
return;
#ifdef ACID_ROLL
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)
switch (cave[x-1][y])
{
+ case Zplayer:
+ if (!game_em.use_old_push_elements)
+ break;
case Zborder:
case Zbug:
case Ztank:
case Xboom_tank:
case Xboom_android:
case Xboom_1:
+ Lpush_element_old(x, y, Xnut);
return;
#ifdef ACID_ROLL
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)
switch (cave[x+1][y])
{
+ case Zplayer:
+ if (!game_em.use_old_push_elements)
+ break;
case Zborder:
case Zbug:
case Ztank:
case Xboom_tank:
case Xboom_android:
case Xboom_1:
+ Lpush_element_old(x, y, Xspring);
return;
#ifdef ACID_ROLL
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)
switch (cave[x-1][y])
{
+ case Zplayer:
+ if (!game_em.use_old_push_elements)
+ break;
case Zborder:
case Zbug:
case Ztank:
case Xboom_tank:
case Xboom_android:
case Xboom_1:
+ Lpush_element_old(x, y, Xspring);
return;
#ifdef ACID_ROLL
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)
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;
}
}
-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)
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;
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));
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];
}
}
+
+ /* 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;
+ }
}
static void logic_objects(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;
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;