#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(x) ((seed = seed << 31 | seed >> 1) % x)
static short **cave, **next, **boom;
static unsigned int seed;
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);
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 boolean player_killed(struct PLAYER *ply)
{
int x = ply->x;
}
}
+ /* 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;
}
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);
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);
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);
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);
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);