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

diff --git a/src/game_em/synchro_2.c b/src/game_em/synchro_2.c
index 3ce1efeb..8fc7ada1 100644
--- a/src/game_em/synchro_2.c
+++ b/src/game_em/synchro_2.c
@@ -8,25 +8,48 @@
  * compilers suck.
  */
 
-#include "display.h"
-#include "tile.h"
-#include "level.h"
-#include "sample.h"
+#include "main_em.h"
 
 
 #define RANDOM (random = random << 31 | random >> 1)
 
+static void set_nearest_player_xy(int x, int y, int *dx, int *dy)
+{
+  int distance, distance_shortest = EM_MAX_CAVE_WIDTH + EM_MAX_CAVE_HEIGHT;
+  int i;
+
+  /* default values if no players are alive anymore */
+  *dx = 0;
+  *dy = 0;
+
+  for (i = 0; i < MAX_PLAYERS; i++)
+  {
+    if (!ply[i].alive)
+      continue;
+
+    distance = ABS(ply[i].x - x) + ABS(ply[i].y - y);
+
+    if (distance < distance_shortest)
+    {
+      *dx = ply[i].x;
+      *dy = ply[i].y;
+
+      distance_shortest = distance;
+    }
+  }
+}
+
 void synchro_2(void)
 {
-  register unsigned int x = 0;
-  register unsigned int y = 1;
-  register unsigned long random = Random;
-  register unsigned short *cave_cache = Cave[y]; /* might be a win */
-  unsigned long score = 0;
-
-  unsigned int temp = 0;	/* initialized to make compilers happy */
-  unsigned int dx; /* only needed to find closest player */
-  unsigned int dy;
+  int x = 0;
+  int y = 1;
+  unsigned int random = RandomEM;
+  short *cave_cache = Cave[y];	/* might be a win */
+  int score = 0;
+
+  int temp = 0;			/* initialized to make compilers happy */
+  int dx;			/* only needed to find closest player */
+  int dy;
   int element;
 
  loop:
@@ -588,7 +611,7 @@ void synchro_2(void)
   	  Boom[y+2][x-1] = Xemerald;
   	  Boom[y+2][x] = Xemerald;
   	  Boom[y+2][x+1] = Xemerald;
-#if 0
+#if PLAY_ELEMENT_SOUND
 	  play_element_sound(x, y, SAMPLE_boom, element);
 #endif
   	  score += lev.bug_score;
@@ -614,7 +637,7 @@ void synchro_2(void)
   	  Boom[y+2][x-1] = Xblank;
   	  Boom[y+2][x] = Xblank;
   	  Boom[y+2][x+1] = Xblank;
-#if 0
+#if PLAY_ELEMENT_SOUND
 	  play_element_sound(x, y, SAMPLE_boom, element);
 #endif
   	  score += lev.tank_score;
@@ -674,7 +697,7 @@ void synchro_2(void)
   	  Boom[y+2][x-1] = lev.eater_array[lev.eater_pos][6];
   	  Boom[y+2][x] = lev.eater_array[lev.eater_pos][7];
   	  Boom[y+2][x+1] = lev.eater_array[lev.eater_pos][8];
-#if 0
+#if PLAY_ELEMENT_SOUND
 	  play_element_sound(x, y, SAMPLE_boom, element);
 #endif
   	  lev.eater_pos = (lev.eater_pos + 1) & 7;
@@ -695,7 +718,7 @@ void synchro_2(void)
   	  Boom[y+2][x-1] = Xblank;
   	  Boom[y+2][x] = Xblank;
   	  Boom[y+2][x+1] = Xblank;
-#if 0
+#if PLAY_ELEMENT_SOUND
 	  play_element_sound(x, y, SAMPLE_boom, element);
 #endif
   	  score += lev.alien_score;
@@ -776,7 +799,7 @@ void synchro_2(void)
   	  Boom[y+2][x-1] = Xblank;
   	  Boom[y+2][x] = Xblank;
   	  Boom[y+2][x+1] = Xblank;
-#if 0
+#if PLAY_ELEMENT_SOUND
 	  play_element_sound(x, y, SAMPLE_boom, element);
 #endif
   	  goto loop;
@@ -1879,37 +1902,7 @@ void synchro_2(void)
 	    Cave[y+1][x+1] == Zplayer)
 	  goto android_still;
 
-  	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;
-  	}
+	set_nearest_player_xy(x, y, &dx, &dy);
 
   	Next[y][x] = Xblank;	/* assume we will move */
   	temp = ((x < dx) + 1 - (x > dx)) + ((y < dy) + 1 - (y > dy)) * 3;
@@ -2807,7 +2800,7 @@ void synchro_2(void)
   	  Boom[y+2][x-1] = Xblank;
   	  Boom[y+2][x] = Xblank;
   	  Boom[y+2][x+1] = Xblank;
-#if 0
+#if PLAY_ELEMENT_SOUND
 	  play_element_sound(x, y, SAMPLE_boom, element);
 #endif
   	  goto loop;
@@ -2832,7 +2825,7 @@ void synchro_2(void)
   	  Boom[y+2][x-1] = Xemerald;
   	  Boom[y+2][x] = Xemerald;
   	  Boom[y+2][x+1] = Xemerald;
-#if 0
+#if PLAY_ELEMENT_SOUND
 	  play_element_sound(x, y, SAMPLE_boom, element);
 #endif
   	  score += lev.bug_score;
@@ -2858,7 +2851,7 @@ void synchro_2(void)
   	  Boom[y+2][x-1] = Xblank;
   	  Boom[y+2][x] = Xblank;
   	  Boom[y+2][x+1] = Xblank;
-#if 0
+#if PLAY_ELEMENT_SOUND
 	  play_element_sound(x, y, SAMPLE_boom, element);
 #endif
   	  score += lev.tank_score;
@@ -2880,7 +2873,7 @@ void synchro_2(void)
   	  Boom[y+2][x-1] = lev.eater_array[lev.eater_pos][6];
   	  Boom[y+2][x] = lev.eater_array[lev.eater_pos][7];
   	  Boom[y+2][x+1] = lev.eater_array[lev.eater_pos][8];
-#if 0
+#if PLAY_ELEMENT_SOUND
 	  play_element_sound(x, y, SAMPLE_boom, element);
 #endif
   	  lev.eater_pos = (lev.eater_pos + 1) & 7;
@@ -2901,7 +2894,7 @@ void synchro_2(void)
   	  Boom[y+2][x-1] = Xblank;
   	  Boom[y+2][x] = Xblank;
   	  Boom[y+2][x+1] = Xblank;
-#if 0
+#if PLAY_ELEMENT_SOUND
 	  play_element_sound(x, y, SAMPLE_boom, element);
 #endif
   	  score += lev.alien_score;
@@ -3205,41 +3198,15 @@ void synchro_2(void)
     /* --------------------------------------------------------------------- */
 
     case Xalien:
+
       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;
+	set_nearest_player_xy(x, y, &dx, &dy);
       }
 
       if (RANDOM & 1)
@@ -4141,7 +4108,7 @@ void synchro_2(void)
   	  Boom[y+1][x-1] = Xblank;
   	  Boom[y+1][x] = Xblank;
   	  Boom[y+1][x+1] = Xblank;
-#if 0
+#if PLAY_ELEMENT_SOUND
 	  play_element_sound(x, y, SAMPLE_boom, element);
 #endif
   	  goto loop;
@@ -4517,7 +4484,8 @@ void synchro_2(void)
 	}
       }
 
-      lev.ball_pos = (lev.ball_pos + 1) & 7;
+      lev.ball_pos = (lev.ball_pos + 1) % lev.num_ball_arrays;
+
       goto loop;
 
     /* --------------------------------------------------------------------- */
@@ -4664,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;
 
@@ -4725,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;
@@ -4826,7 +4804,7 @@ void synchro_2(void)
       Boom[y+1][x-1] = Xemerald;
       Boom[y+1][x] = Xemerald;
       Boom[y+1][x+1] = Xemerald;
-#if 0
+#if PLAY_ELEMENT_SOUND
       play_element_sound(x, y, SAMPLE_boom, element);
 #endif
       goto loop;
@@ -4845,19 +4823,22 @@ void synchro_2(void)
       Boom[y+1][x-1] = Xblank;
       Boom[y+1][x] = Xblank;
       Boom[y+1][x+1] = Xblank;
-#if 0
+#if PLAY_ELEMENT_SOUND
       play_element_sound(x, y, SAMPLE_boom, element);
 #endif
       goto loop;
 
     case Xboom_android:
-#if 0
+#if PLAY_ELEMENT_SOUND
       play_element_sound(x, y, SAMPLE_boom, Xandroid);
 #endif
     case Xboom_1:
       Next[y][x] = Xboom_2;
-#if 1
-      play_sound(x, y, SAMPLE_boom);
+#if !PLAY_ELEMENT_SOUND
+      if (x != lev.exit_x && y != lev.exit_y)
+	play_sound(x, y, SAMPLE_boom);
+      else
+	lev.exit_x = lev.exit_y = -1;
 #endif
       goto loop;
 
@@ -4884,10 +4865,10 @@ void synchro_2(void)
 
  done:
 
-  if (ply1.alive || ply2.alive)
-    lev.score += score; /* only get a score if someone is alive */
+  if (ply[0].alive || ply[1].alive || ply[2].alive || ply[3].alive)
+    lev.score += score;		/* only add a score if someone is alive */
 
-  Random = random;
+  RandomEM = random;
 
   {
     void *temp = Cave;