X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Flogic.c;h=5d00cbf8b78d7b2a49f642daef0e20c7da836786;hb=559df68519c1c2aa3b81689ee747b49fae22c931;hp=9376c558929dcc821035e732eecf3d7caf4472d7;hpb=e1015ff65ebebc0362ba23172acef6f35dc69f51;p=rocksndiamonds.git

diff --git a/src/game_em/logic.c b/src/game_em/logic.c
index 9376c558..5d00cbf8 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;
@@ -152,7 +150,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 +214,22 @@ 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 boolean player_killed(struct PLAYER *ply)
 {
   int x = ply->x;
@@ -467,7 +481,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:
@@ -513,6 +527,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 +543,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 +551,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 +577,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;
@@ -1290,6 +1295,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;
 }
 
@@ -4483,7 +4493,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);
@@ -4493,7 +4503,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);
@@ -4509,7 +4519,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);
@@ -4525,7 +4535,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);
@@ -4604,8 +4614,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);