X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fsynchro_1.c;h=c6f0067428dc59360b0189fab5b8d8acc594568d;hb=c4dd9e14b72b528e82bc018fe2fa76b784221584;hp=3f7643fba41f2c28851dd27673c0c0d8a5c30293;hpb=ec36fe263402351ac67b70400f11096a044365fe;p=rocksndiamonds.git

diff --git a/src/game_em/synchro_1.c b/src/game_em/synchro_1.c
index 3f7643fb..c6f00674 100644
--- a/src/game_em/synchro_1.c
+++ b/src/game_em/synchro_1.c
@@ -11,26 +11,92 @@
 #include "display.h"
 
 
-static void player(struct PLAYER *);
+#if 0
+extern int centered_player_nr;
+#endif
+
+extern boolean checkIfAllPlayersFitToScreen();
+
+static void check_player(struct PLAYER *);
+static void kill_player(struct PLAYER *);
 static boolean player_digfield(struct PLAYER *, int, int);
-static int test(struct PLAYER *);
-static void die(struct PLAYER *);
+static boolean player_killed(struct PLAYER *);
 
 void synchro_1(void)
 {
- /* must test for death and actually kill separately */
-  char ply1_kill = test(&ply1);
-  char ply2_kill = test(&ply2);
+#if 1
+
+  int start_check_nr;
+  int i;
+
+  game_em.any_player_moving = FALSE;
+
+  /* must test for death and actually kill separately */
+
+  for (i = 0; i < MAX_PLAYERS; i++)
+  {
+    boolean ply_kill = player_killed(&ply[i]);
+
+    if (ply[i].alive && ply_kill)
+      kill_player(&ply[i]);
+  }
+
+#else
+
+  /* must test for death and actually kill separately */
+  boolean ply1_kill = player_killed(&ply1);
+  boolean ply2_kill = player_killed(&ply2);
 
   if (ply1.alive && ply1_kill)
-    die(&ply1);
+    kill_player(&ply1);
   if (ply2.alive && ply2_kill)
-    die(&ply2);
+    kill_player(&ply2);
+
+#endif
 
 #if 0
   ply1.alive = 1; /* debugging */
 #endif
 
+#if 1
+
+  for (i = 0; i < MAX_PLAYERS; i++)
+  {
+    ply[i].oldx = ply[i].x;
+    ply[i].oldy = ply[i].y;
+    ply[i].anim = SPR_still;
+  }
+
+  start_check_nr = (RandomEM & 128 ? 0 : 1) * 2 + (RandomEM & 256 ? 0 : 1);
+
+  for (i = 0; i < MAX_PLAYERS; i++)
+  {
+    int check_nr = (start_check_nr + i) % MAX_PLAYERS;
+
+    if (ply[check_nr].alive)
+      check_player(&ply[check_nr]);
+  }
+
+  for (i = 0; i < MAX_PLAYERS; i++)
+  {
+    if (!ply[i].alive)
+      continue;
+
+    if (Cave[ply[i].oldy][ply[i].oldx] == Zplayer)
+    {
+      Cave[ply[i].oldy][ply[i].oldx] = Xblank;
+      Next[ply[i].oldy][ply[i].oldx] = Xblank;
+    }
+
+    if (Cave[ply[i].y][ply[i].x] == Xblank)
+    {
+      Cave[ply[i].y][ply[i].x] = Zplayer;
+      Next[ply[i].y][ply[i].x] = Zplayer;
+    }
+  }
+
+#else
+
   ply1.oldx = ply1.x;
   ply1.oldy = ply1.y;
   ply1.anim = SPR_still;
@@ -38,15 +104,15 @@ void synchro_1(void)
   ply2.oldy = ply2.y;
   ply2.anim = SPR_still;
 
-  if (Random & 256)
+  if (RandomEM & 256)
   {
-    if (ply1.alive) player(&ply1);
-    if (ply2.alive) player(&ply2);
+    if (ply1.alive) check_player(&ply1);
+    if (ply2.alive) check_player(&ply2);
   }
   else
   {
-    if (ply2.alive) player(&ply2);
-    if (ply1.alive) player(&ply1);
+    if (ply2.alive) check_player(&ply2);
+    if (ply1.alive) check_player(&ply1);
   }
 
   if (ply1.alive)
@@ -78,18 +144,29 @@ void synchro_1(void)
       Next[ply2.y][ply2.x] = Zplayer;
     }
   }
+
+#endif
 }
 
-static int test(struct PLAYER *ply)
+static boolean player_killed(struct PLAYER *ply)
 {
-  register unsigned int x = ply->x;
-  register unsigned int y = ply->y;
+  int x = ply->x;
+  int y = ply->y;
+
+#if 0
+  printf("::: %d: %d, %d\n", ply->num, x, y);
+#endif
 
   if (!ply->alive)
-    return 0;
+    return FALSE;
 
-  if (lev.time_initial > 0 && lev.time == 0)
-    return 1;
+#if 1
+  if (lev.killed_out_of_time && setup.time_limit)
+    return TRUE;
+#else
+  if (lev.time_initial > 0 && lev.time == 0 && setup.time_limit)
+    return TRUE;
+#endif
 
   switch(Cave[y-1][x])
   {
@@ -109,7 +186,7 @@ static int test(struct PLAYER *ply)
     case Xtank_goe:
     case Xtank_gos:
     case Xtank_gow:
-      return 1;
+      return TRUE;
   }
 
   switch(Cave[y][x+1])
@@ -130,7 +207,7 @@ static int test(struct PLAYER *ply)
     case Xtank_goe:
     case Xtank_gos:
     case Xtank_gow:
-      return 1;
+      return TRUE;
   }
 
   switch(Cave[y+1][x])
@@ -151,7 +228,7 @@ static int test(struct PLAYER *ply)
     case Xtank_goe:
     case Xtank_gos:
     case Xtank_gow:
-      return 1;
+      return TRUE;
   }
 
   switch(Cave[y][x-1])
@@ -172,7 +249,7 @@ static int test(struct PLAYER *ply)
     case Xtank_goe:
     case Xtank_gos:
     case Xtank_gow:
-      return 1;
+      return TRUE;
   }
 
   switch(Cave[y][x])
@@ -185,16 +262,26 @@ static int test(struct PLAYER *ply)
     case Xdynamite_2:
     case Xdynamite_3:
     case Xdynamite_4:
-      return 0;
+#if 1
+    case Xfake_acid_1:
+    case Xfake_acid_2:
+    case Xfake_acid_3:
+    case Xfake_acid_4:
+    case Xfake_acid_5:
+    case Xfake_acid_6:
+    case Xfake_acid_7:
+    case Xfake_acid_8:
+#endif
+      return FALSE;
   }
 
-  return 1;
+  return TRUE;
 }
 
-static void die(struct PLAYER *ply)
+static void kill_player(struct PLAYER *ply)
 {
-  register unsigned int x = ply->x;
-  register unsigned int y = ply->y;
+  int x = ply->x;
+  int y = ply->y;
 
   ply->alive = 0;
 
@@ -327,7 +414,7 @@ static void die(struct PLAYER *ply)
     case Xexit_1:
     case Xexit_2:
     case Xexit_3:
-      play_element_sound(x, y, SAMPLE_exit, Xexit_1);
+      play_element_sound(x, y, SAMPLE_exit_leave, Xexit_1);
       break;
 
     default:
@@ -335,17 +422,34 @@ static void die(struct PLAYER *ply)
       break;
   }
 
-  Cave[y][x] = Xboom_1;
-  Boom[y][x] = Xblank;
+  switch(Cave[y][x])
+  {
+#if 1
+    case Xacid_1:
+    case Xacid_2:
+    case Xacid_3:
+    case Xacid_4:
+    case Xacid_5:
+    case Xacid_6:
+    case Xacid_7:
+    case Xacid_8:
+      break;
+#endif
+
+    default:
+      Cave[y][x] = Xboom_1;
+      Boom[y][x] = Xblank;
+      break;
+  }
 }
 
-static void player(struct PLAYER *ply)
+static void check_player(struct PLAYER *ply)
 {
-  unsigned int oldx = ply->x;
-  unsigned int oldy = ply->y;
-  register unsigned int x = oldx;
-  register unsigned int y = oldy;
-  unsigned int anim = 0;
+  int oldx = ply->x;
+  int oldy = ply->y;
+  int x = oldx;
+  int y = oldy;
+  int anim = 0;
   int dx = 0, dy = 0;
 
 #if 0
@@ -439,6 +543,31 @@ static void player(struct PLAYER *ply)
   }
 #endif
 
+  if (dx || dy)
+  {
+    int oldx = ply->x;
+    int oldy = ply->y;
+    int x = oldx + dx;
+    int y = oldy + dy;
+    boolean can_move = TRUE;
+
+    ply->x = x;
+    ply->y = y;
+
+    can_move = (game.centered_player_nr != -1 ||
+		checkIfAllPlayersFitToScreen());
+
+    ply->x = oldx;
+    ply->y = oldy;
+
+    if (!can_move)
+    {
+      ply->joy_n = ply->joy_e = ply->joy_s = ply->joy_w = 0;
+
+      return;
+    }
+  }
+
   if (dx == 0 && dy == 0)
   {
     ply->joy_stick = 0;
@@ -457,14 +586,14 @@ static void player(struct PLAYER *ply)
       ply->dynamite_cnt = 0;
     }
 
-    Random += 7;	/* be a bit more random if the player doesn't move */
+    RandomEM += 7;	/* be a bit more random if the player doesn't move */
 
     return;
   }
 
   ply->joy_stick = 1;
   ply->joy_n = ply->joy_e = ply->joy_s = ply->joy_w = 0;
-  ply->dynamite_cnt = 0; /* reset dynamite timer if we move */
+  ply->dynamite_cnt = 0;	/* reset dynamite timer if we move */
   ply->joy_spin = !ply->joy_spin;
 
   if (ply->joy_snap == 0)		/* player wants to move */
@@ -488,6 +617,10 @@ static void player(struct PLAYER *ply)
 	ply->last_move_dir = (dx < 0 ? MV_LEFT : MV_RIGHT);
       else if (oldy != ply->y)
 	ply->last_move_dir = (dy < 0 ? MV_UP : MV_DOWN);
+
+      game_em.any_player_moving = TRUE;
+      game_em.last_moving_player = ply->num;
+      game_em.last_player_direction[ply->num] = ply->last_move_dir;
     }
   }
   else					/* player wants to snap */
@@ -499,10 +632,10 @@ static void player(struct PLAYER *ply)
 static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 {
   int anim = (dx < 0 ? 3 : dx > 0 ? 1 : dy < 0 ? 0 : dy > 0 ? 2 : 2);
-  unsigned int oldx = ply->x;
-  unsigned int oldy = ply->y;
-  register unsigned int x = oldx + dx;
-  register unsigned int y = oldy + dy;
+  int oldx = ply->x;
+  int oldy = ply->y;
+  int x = oldx + dx;
+  int y = oldy + dy;
   boolean result = TRUE;
 
   if (!dx && !dy)			/* no direction specified */
@@ -523,12 +656,38 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
       case Yacid_splash_wB:
 	Cave[y][x] = Zplayer;
 	Next[y][x] = Zplayer;
+#if 1
+      case Xfake_acid_1:
+      case Xfake_acid_2:
+      case Xfake_acid_3:
+      case Xfake_acid_4:
+      case Xfake_acid_5:
+      case Xfake_acid_6:
+      case Xfake_acid_7:
+      case Xfake_acid_8:
+#endif
 	play_element_sound(x, y, SAMPLE_blank, Xblank);
 	ply->anim = SPR_walk + anim;
 	ply->x = x;
 	ply->y = y;
 	break;
 
+#if 1
+      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
+	if (Cave[y-1][x+1] == Xblank)
+	  Cave[y-1][x+1] = Yacid_splash_eB;
+	if (Cave[y-1][x-1] == Xblank)
+	  Cave[y-1][x-1] = Yacid_splash_wB;
+	play_element_sound(x, y, SAMPLE_acid, Xacid_1);
+
       case Xboom_android:
       case Xboom_1:
       case Xbug_n:
@@ -547,6 +706,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
       case Xtank_goe:
       case Xtank_gos:
       case Xtank_gow:
+#if 0
       case Xacid_1:
       case Xacid_2:
       case Xacid_3:
@@ -555,6 +715,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
       case Xacid_6:
       case Xacid_7:
       case Xacid_8:
+#endif
 	ply->anim = SPR_walk + anim;
 	ply->x = x;
 	ply->y = y;
@@ -705,7 +866,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 	      Cave[y-1][x+dx+1] = Yacid_splash_eB;
 	    if (Cave[y-1][x+dx-1] == Xblank)
 	      Cave[y-1][x+dx-1] = Yacid_splash_wB;
-	    play_sound(x, y, SAMPLE_acid);
+	    play_element_sound(x, y, SAMPLE_acid, Xacid_1);
 	    goto stone_walk;
 
           case Xblank:
@@ -743,7 +904,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 	      Cave[y-1][x+dx+1] = Yacid_splash_eB;
 	    if (Cave[y-1][x+dx-1] == Xblank)
 	      Cave[y-1][x+dx-1] = Yacid_splash_wB;
-	    play_sound(x, y, SAMPLE_acid);
+	    play_element_sound(x, y, SAMPLE_acid, Xacid_1);
 	    goto bomb_walk;
 
 	  case Xblank:
@@ -781,7 +942,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 	      Cave[y-1][x+dx+1] = Yacid_splash_eB;
 	    if (Cave[y-1][x+dx-1] == Xblank)
 	      Cave[y-1][x+dx-1] = Yacid_splash_wB;
-	    play_sound(x, y, SAMPLE_acid);
+	    play_element_sound(x, y, SAMPLE_acid, Xacid_1);
 	    goto nut_walk;
 
           case Xblank:
@@ -830,7 +991,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 	      Cave[y-1][x+dx+1] = Yacid_splash_eB;
 	    if (Cave[y-1][x+dx-1] == Xblank)
 	      Cave[y-1][x+dx-1] = Yacid_splash_wB;
-	    play_sound(x, y, SAMPLE_acid);
+	    play_element_sound(x, y, SAMPLE_acid, Xacid_1);
 	    goto spring_walk;
 
           case Xblank:
@@ -878,7 +1039,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 	      Cave[y+dy-1][x+dx+1] = Yacid_splash_eB;
 	    if (Cave[y+dy-1][x+dx-1] == Xblank)
 	      Cave[y+dy-1][x+dx-1] = Yacid_splash_wB;
-	    play_sound(x, y, SAMPLE_acid);
+	    play_element_sound(x, y, SAMPLE_acid, Xacid_1);
 	    goto balloon_walk;
 
           case Xblank:
@@ -923,7 +1084,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 	      Cave[y+dy-1][x+dx+1] = Yacid_splash_eB;
 	    if (Cave[y+dy-1][x+dx-1] == Xblank)
 	      Cave[y+dy-1][x+dx-1] = Yacid_splash_wB;
-	    play_sound(x, y, SAMPLE_acid);
+	    play_element_sound(x, y, SAMPLE_acid, Xacid_1);
 	    goto android_walk;
 
           case Xblank:
@@ -1069,10 +1230,15 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
       case Xexit_1:
       case Xexit_2:
       case Xexit_3:
-	play_element_sound(x, y, SAMPLE_exit, Xexit_1);
+	play_element_sound(x, y, SAMPLE_exit_leave, Xexit_1);
+
+	lev.home--;
 
-	if (--lev.home == 0 && lev.time_initial > 0)	/* game won */
+#if 0
+	/* !!! CHECK SCORE CALCULATION !!! */
+	if (lev.home == 0 && lev.time_initial > 0)	/* game won */
 	  lev.score += lev.time * lev.exit_score / 100;
+#endif
 
 	ply->anim = SPR_walk + anim;
 	ply->x = x;