X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame_em%2Fsynchro_2.c;h=8fc7ada1d9e91dcafebc7982380d7427d0d68d74;hp=7657bf8ddfda096fbbf52f131f4bd540900ec8a8;hb=520916c89d7d96944bf3d66e3caa5afd840df74c;hpb=7c0b78ef65acbe880d7f905a5e38fb7bdac8f007

diff --git a/src/game_em/synchro_2.c b/src/game_em/synchro_2.c
index 7657bf8d..8fc7ada1 100644
--- a/src/game_em/synchro_2.c
+++ b/src/game_em/synchro_2.c
@@ -43,7 +43,7 @@ void synchro_2(void)
 {
   int x = 0;
   int y = 1;
-  unsigned long random = RandomEM;
+  unsigned int random = RandomEM;
   short *cave_cache = Cave[y];	/* might be a win */
   int score = 0;
 
@@ -1902,46 +1902,8 @@ void synchro_2(void)
 	    Cave[y+1][x+1] == Zplayer)
 	  goto android_still;
 
-#if 1
-
 	set_nearest_player_xy(x, y, &dx, &dy);
 
-#else
-
-  	if (ply1.alive && ply2.alive)
-	{
-  	  if ((ply1.x > x ? ply1.x - x : x - ply1.x) +
-	      (ply1.y > y ? ply1.y - y : y - ply1.y) <
-	      (ply2.x > x ? ply2.x - x : x - ply2.x) +
-	      (ply2.y > y ? ply2.y - y : y - ply2.y))
-	  {
-  	    dx = ply1.x;
-  	    dy = ply1.y;
-  	  }
-	  else
-	  {
-  	    dx = ply2.x;
-  	    dy = ply2.y;
-  	  }
-  	}
-	else if (ply1.alive)
-	{
-  	  dx = ply1.x;
-  	  dy = ply1.y;
-  	}
-	else if (ply2.alive)
-	{
-  	  dx = ply2.x;
-  	  dy = ply2.y;
-  	}
-	else
-	{
-  	  dx = 0;
-  	  dy = 0;
-  	}
-
-#endif
-
   	Next[y][x] = Xblank;	/* assume we will move */
   	temp = ((x < dx) + 1 - (x > dx)) + ((y < dy) + 1 - (y > dy)) * 3;
 
@@ -3237,8 +3199,6 @@ void synchro_2(void)
 
     case Xalien:
 
-#if 1
-
       if (lev.wheel_cnt)
       {
 	dx = lev.wheel_x;
@@ -3249,47 +3209,6 @@ void synchro_2(void)
 	set_nearest_player_xy(x, y, &dx, &dy);
       }
 
-#else
-
-      if (lev.wheel_cnt)
-      {
-	dx = lev.wheel_x;
-	dy = lev.wheel_y;
-      }
-      else if (ply1.alive && ply2.alive)
-      {
-	if ((ply1.x > x ? ply1.x - x : x - ply1.x) +
-	    (ply1.y > y ? ply1.y - y : y - ply1.y) <
-	    (ply2.x > x ? ply2.x - x : x - ply2.x) +
-	    (ply2.y > y ? ply2.y - y : y - ply2.y))
-	{
-	  dx = ply1.x;
-	  dy = ply1.y;
-	}
-	else
-	{
-	  dx = ply2.x;
-	  dy = ply2.y;
-	}
-      }
-      else if (ply1.alive)
-      {
-	dx = ply1.x;
-	dy = ply1.y;
-      }
-      else if (ply2.alive)
-      {
-	dx = ply2.x;
-	dy = ply2.y;
-      }
-      else
-      {
-	dx = 0;
-	dy = 0;
-      }
-
-#endif
-
       if (RANDOM & 1)
       {
 	if (y > dy)
@@ -4565,11 +4484,8 @@ void synchro_2(void)
 	}
       }
 
-#if 1
       lev.ball_pos = (lev.ball_pos + 1) % lev.num_ball_arrays;
-#else
-      lev.ball_pos = (lev.ball_pos + 1) & 7;
-#endif
+
       goto loop;
 
     /* --------------------------------------------------------------------- */
@@ -4716,21 +4632,21 @@ void synchro_2(void)
   	case Xacid_6:
   	case Xacid_7:
   	case Xacid_8:
-  	  Cave[y][x] = Xsand_stonesand_3;
+  	  Cave[y][x] = Xsand_stonesand_quickout_1;
   	  if (Cave[y][x+1] == Xblank)
 	    Cave[y][x+1] = Yacid_splash_eB;
   	  if (Cave[y][x-1] == Xblank)
 	    Cave[y][x-1] = Yacid_splash_wB;
-  	  Next[y][x] = Xsand_stonesand_4;
+  	  Next[y][x] = Xsand_stonesand_quickout_2;
   	  play_element_sound(x, y, SAMPLE_acid, Xacid_1);
   	  goto loop;
 
   	case Xblank:
   	case Yacid_splash_eB:
   	case Yacid_splash_wB:
-  	  Cave[y][x] = Xsand_stonesand_3;
+  	  Cave[y][x] = Xsand_stonesand_quickout_1;
   	  Cave[y+1][x] = Xsand_stoneout_1;
-  	  Next[y][x] = Xsand_stonesand_4;
+  	  Next[y][x] = Xsand_stonesand_quickout_2;
   	  Next[y+1][x] = Xsand_stoneout_2;
   	  goto loop;
 
@@ -4777,6 +4693,16 @@ void synchro_2(void)
       Next[y][x] = Xsand;
       goto loop;
 
+#if 1
+    case Xsand_stonesand_quickout_1:
+      Next[y][x] = Xsand_stonesand_quickout_2;
+      goto loop;
+
+    case Xsand_stonesand_quickout_2:
+      Next[y][x] = Xsand;
+      goto loop;
+#endif
+
     case Xsand_stoneout_1:
       Next[y][x] = Xsand_stoneout_2;
       goto loop;