X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fsynchro_2.c;h=1ab59546bc14d613ef83c50f0916f547bb32707a;hb=5fb4ddfd1d152d256f6b30e2dfeae0d14681893e;hp=119d86a5832c1fd7d229d0e5b96057388937fce5;hpb=37a06df577bbfd00f4b361f92cacb0d97036ba93;p=rocksndiamonds.git

diff --git a/src/game_em/synchro_2.c b/src/game_em/synchro_2.c
index 119d86a5..1ab59546 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 = RandomEM;
-  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 long 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:
@@ -1879,6 +1902,12 @@ 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) +
@@ -1911,6 +1940,8 @@ void synchro_2(void)
   	  dy = 0;
   	}
 
+#endif
+
   	Next[y][x] = Xblank;	/* assume we will move */
   	temp = ((x < dx) + 1 - (x > dx)) + ((y < dy) + 1 - (y > dy)) * 3;
 
@@ -3205,6 +3236,21 @@ void synchro_2(void)
     /* --------------------------------------------------------------------- */
 
     case Xalien:
+
+#if 1
+
+      if (lev.wheel_cnt)
+      {
+	dx = lev.wheel_x;
+	dy = lev.wheel_y;
+      }
+      else
+      {
+	set_nearest_player_xy(x, y, &dx, &dy);
+      }
+
+#else
+
       if (lev.wheel_cnt)
       {
 	dx = lev.wheel_x;
@@ -3242,6 +3288,8 @@ void synchro_2(void)
 	dy = 0;
       }
 
+#endif
+
       if (RANDOM & 1)
       {
 	if (y > dy)
@@ -4888,8 +4936,8 @@ 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 */
 
   RandomEM = random;