X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame_em%2Fsynchro_1.c;h=b390ad916e71dfeec0f108d8fa38d81edbdd9b7b;hp=147da4aff72b564899e3155701d3ce52b8e03e7a;hb=99261bc36a147246e39cdc6d5ce9b098257c4d1b;hpb=3e71d06e9a97be7bb8c50c76717d08e5c46e0cc8

diff --git a/src/game_em/synchro_1.c b/src/game_em/synchro_1.c
index 147da4af..b390ad91 100644
--- a/src/game_em/synchro_1.c
+++ b/src/game_em/synchro_1.c
@@ -5,12 +5,11 @@
  * large switch statement for tiles the player interacts with.
  */
 
-#include "tile.h"
-#include "level.h"
-#include "sample.h"
-#include "display.h"
+#include "main_em.h"
 
 
+#define USE_CHANGED_ACID_STUFF		1
+
 static void check_player(struct PLAYER *);
 static void kill_player(struct PLAYER *);
 static boolean player_digfield(struct PLAYER *, int, int);
@@ -18,15 +17,13 @@ static boolean player_killed(struct PLAYER *);
 
 void synchro_1(void)
 {
-#if 1
-
   int start_check_nr;
   int i;
 
   game_em.any_player_moving = FALSE;
+  game_em.any_player_snapping = FALSE;
 
   /* must test for death and actually kill separately */
-
   for (i = 0; i < MAX_PLAYERS; i++)
   {
     boolean ply_kill = player_killed(&ply[i]);
@@ -35,25 +32,6 @@ void synchro_1(void)
       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)
-    kill_player(&ply1);
-  if (ply2.alive && ply2_kill)
-    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;
@@ -88,58 +66,6 @@ void synchro_1(void)
       Next[ply[i].y][ply[i].x] = Zplayer;
     }
   }
-
-#else
-
-  ply1.oldx = ply1.x;
-  ply1.oldy = ply1.y;
-  ply1.anim = SPR_still;
-  ply2.oldx = ply2.x;
-  ply2.oldy = ply2.y;
-  ply2.anim = SPR_still;
-
-  if (RandomEM & 256)
-  {
-    if (ply1.alive) check_player(&ply1);
-    if (ply2.alive) check_player(&ply2);
-  }
-  else
-  {
-    if (ply2.alive) check_player(&ply2);
-    if (ply1.alive) check_player(&ply1);
-  }
-
-  if (ply1.alive)
-  {
-    if (Cave[ply1.oldy][ply1.oldx] == Zplayer)
-    {
-      Cave[ply1.oldy][ply1.oldx] = Xblank;
-      Next[ply1.oldy][ply1.oldx] = Xblank;
-    }
-
-    if (Cave[ply1.y][ply1.x] == Xblank)
-    {
-      Cave[ply1.y][ply1.x] = Zplayer;
-      Next[ply1.y][ply1.x] = Zplayer;
-    }
-  }
-
-  if (ply2.alive)
-  {
-    if (Cave[ply2.oldy][ply2.oldx] == Zplayer)
-    {
-      Cave[ply2.oldy][ply2.oldx] = Xblank;
-      Next[ply2.oldy][ply2.oldx] = Xblank;
-    }
-
-    if (Cave[ply2.y][ply2.x] == Xblank)
-    {
-      Cave[ply2.y][ply2.x] = Zplayer;
-      Next[ply2.y][ply2.x] = Zplayer;
-    }
-  }
-
-#endif
 }
 
 static boolean player_killed(struct PLAYER *ply)
@@ -147,20 +73,11 @@ static boolean player_killed(struct PLAYER *ply)
   int x = ply->x;
   int y = ply->y;
 
-#if 0
-  printf("::: %d: %d, %d\n", ply->num, x, y);
-#endif
-
   if (!ply->alive)
     return FALSE;
 
-#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])
   {
@@ -290,9 +207,6 @@ static void kill_player(struct PLAYER *ply)
     case Xbug_gos:
     case Xbug_gow:
       Cave[y-1][x] = Xboom_bug;
-#if 0
-      play_element_sound(x, y, SAMPLE_boom, Zplayer);
-#endif
       break;
 
     case Xtank_n:
@@ -304,9 +218,6 @@ static void kill_player(struct PLAYER *ply)
     case Xtank_gos:
     case Xtank_gow:
       Cave[y-1][x] = Xboom_bomb;
-#if 0
-      play_element_sound(x, y, SAMPLE_boom, Zplayer);
-#endif
       break;
   }
 
@@ -321,9 +232,6 @@ static void kill_player(struct PLAYER *ply)
     case Xbug_gos:
     case Xbug_gow:
       Cave[y][x+1] = Xboom_bug;
-#if 0
-      play_element_sound(x, y, SAMPLE_boom, Zplayer);
-#endif
       break;
 
     case Xtank_n:
@@ -335,9 +243,6 @@ static void kill_player(struct PLAYER *ply)
     case Xtank_gos:
     case Xtank_gow:
       Cave[y][x+1] = Xboom_bomb;
-#if 0
-      play_element_sound(x, y, SAMPLE_boom, Zplayer);
-#endif
       break;
   }
 
@@ -352,9 +257,6 @@ static void kill_player(struct PLAYER *ply)
     case Xbug_gos:
     case Xbug_gow:
       Cave[y+1][x] = Xboom_bug;
-#if 0
-      play_element_sound(x, y, SAMPLE_boom, Zplayer);
-#endif
       break;
 
     case Xtank_n:
@@ -366,9 +268,6 @@ static void kill_player(struct PLAYER *ply)
     case Xtank_gos:
     case Xtank_gow:
       Cave[y+1][x] = Xboom_bomb;
-#if 0
-      play_element_sound(x, y, SAMPLE_boom, Zplayer);
-#endif
       break;
   }
 
@@ -383,9 +282,6 @@ static void kill_player(struct PLAYER *ply)
     case Xbug_gos:
     case Xbug_gow:
       Cave[y][x-1] = Xboom_bug;
-#if 0
-      play_element_sound(x, y, SAMPLE_boom, Zplayer);
-#endif
       break;
 
     case Xtank_n:
@@ -397,9 +293,6 @@ static void kill_player(struct PLAYER *ply)
     case Xtank_gos:
     case Xtank_gow:
       Cave[y][x-1] = Xboom_bomb;
-#if 0
-      play_element_sound(x, y, SAMPLE_boom, Zplayer);
-#endif
       break;
   }
 
@@ -408,6 +301,8 @@ static void kill_player(struct PLAYER *ply)
     case Xexit_1:
     case Xexit_2:
     case Xexit_3:
+      lev.exit_x = x;
+      lev.exit_y = y;
       play_element_sound(x, y, SAMPLE_exit_leave, Xexit_1);
       break;
 
@@ -418,7 +313,7 @@ static void kill_player(struct PLAYER *ply)
 
   switch(Cave[y][x])
   {
-#if 1
+#if USE_CHANGED_ACID_STUFF
     case Xacid_1:
     case Xacid_2:
     case Xacid_3:
@@ -443,99 +338,69 @@ static void check_player(struct PLAYER *ply)
   int oldy = ply->y;
   int x = oldx;
   int y = oldy;
-  int anim = 0;
   int dx = 0, dy = 0;
 
-#if 0
-  printf("::: up == %d, down == %d, left == %d, right == %d, fire == %d [spin == %d, stick == %d]\n",
-	 ply->joy_n, ply->joy_s, ply->joy_w, ply->joy_e, ply->joy_fire,
-	 ply->joy_spin, ply->joy_stick);
-#endif
+  game_em.last_player_direction[ply->num] = MV_NONE;
 
-#if 1
   if (ply->joy_w)		/* west */
   {
     x--;
     dx = -1;
-    anim = 3;
   }
   else if (ply->joy_e)		/* east */
   {
     x++;
     dx = 1;
-    anim = 1;
   }
 
   if (ply->joy_n)		/* north */
   {
     y--;
     dy = -1;
-    anim = 0;
   }
   else if (ply->joy_s)		/* south */
   {
     y++;
     dy = 1;
-    anim = 2;
   }
 
-#else
-
-  if ((ply->joy_spin = !ply->joy_spin))
-  {
-    if (ply->joy_n)		/* north */
-    {
-      y--;
-      dy = -1;
-      anim = 0;
-    }
-    else if (ply->joy_e)	/* east */
-    {
-      x++;
-      dx = 1;
-      anim = 1;
-    }
-    else if (ply->joy_s)	/* south */
-    {
-      y++;
-      dy = 1;
-      anim = 2;
-    }
-    else if (ply->joy_w)	/* west */
-    {
-      x--;
-      dx = -1;
-      anim = 3;
-    }
-  }
-  else
+  if (dx || dy)
   {
-    if (ply->joy_w)		/* west */
-    {
-      x--;
-      dx = -1;
-      anim = 3;
-    }
-    else if (ply->joy_s)	/* south */
-    {
-      y++;
-      dy = 1;
-      anim = 2;
-    }
-    else if (ply->joy_e)	/* east */
+    int oldx = ply->x;
+    int oldy = ply->y;
+    int x = oldx + dx;
+    int y = oldy + dy;
+    boolean players_visible_before_move;
+    boolean players_visible_after_move;
+    boolean can_move;
+
+    players_visible_before_move = checkIfAllPlayersFitToScreen();
+
+    ply->x = x;
+    ply->y = y;
+
+    players_visible_after_move = checkIfAllPlayersFitToScreen();
+
+    /*
+      player is allowed to move only in the following cases:
+      - it is not needed to display all players (not focussed to all players)
+      - all players are (still or again) visible after the move
+      - some players were already outside visible screen area before the move
+    */
+    can_move = (game.centered_player_nr != -1 ||
+		players_visible_after_move ||
+		!players_visible_before_move);
+
+    ply->x = oldx;
+    ply->y = oldy;
+
+    if (!can_move)
     {
-      x++;
-      dx = 1;
-      anim = 1;
-    }
-    else if (ply->joy_n)	/* north */
-    {
-      y--;
-      dy = -1;
-      anim = 0;
+      ply->joy_n = ply->joy_e = ply->joy_s = ply->joy_w = 0;
+
+      return;
     }
   }
-#endif
 
   if (dx == 0 && dy == 0)
   {
@@ -562,7 +427,7 @@ static void check_player(struct PLAYER *ply)
 
   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 */
@@ -594,7 +459,7 @@ static void check_player(struct PLAYER *ply)
   }
   else					/* player wants to snap */
   {
-    player_digfield(ply, dx, dy);
+    game_em.any_player_snapping = player_digfield(ply, dx, dy);
   }
 }
 
@@ -641,7 +506,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 	ply->y = y;
 	break;
 
-#if 1
+#if USE_CHANGED_ACID_STUFF
       case Xacid_1:
       case Xacid_2:
       case Xacid_3:
@@ -650,12 +515,12 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
       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);
+#endif
 
       case Xboom_android:
       case Xboom_1:
@@ -675,7 +540,8 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
       case Xtank_goe:
       case Xtank_gos:
       case Xtank_gow:
-#if 0
+
+#if !USE_CHANGED_ACID_STUFF
       case Xacid_1:
       case Xacid_2:
       case Xacid_3:
@@ -717,6 +583,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 	play_element_sound(x, y, SAMPLE_collect, element);
 	lev.score += lev.diamond_score;
 	lev.required = lev.required < 3 ? 0 : lev.required - 3;
+	game.snapshot.collected_item = TRUE;
 	ply->anim = SPR_walk + anim;
 	ply->x = x;
 	ply->y = y;
@@ -729,6 +596,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 	play_element_sound(x, y, SAMPLE_collect, element);
 	lev.score += lev.emerald_score;
 	lev.required = lev.required < 1 ? 0 : lev.required - 1;
+	game.snapshot.collected_item = TRUE;
 	ply->anim = SPR_walk + anim;
 	ply->x = x;
 	ply->y = y;
@@ -1199,15 +1067,10 @@ 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_leave, Xexit_1);
-
 	lev.home--;
 
-#if 0
-	/* !!! CHECK SCORE CALCULATION !!! */
-	if (lev.home == 0 && lev.time_initial > 0)	/* game won */
-	  lev.score += lev.time * lev.exit_score / 100;
-#endif
+	if (lev.home == 0)
+	  game_em.level_solved = TRUE;
 
 	ply->anim = SPR_walk + anim;
 	ply->x = x;
@@ -1248,6 +1111,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 	play_element_sound(x, y, SAMPLE_collect, element);
 	lev.score += lev.diamond_score;
 	lev.required = lev.required < 3 ? 0 : lev.required - 3;
+	game.snapshot.collected_item = TRUE;
 	ply->anim = SPR_walk + anim;
 	break;
 
@@ -1258,6 +1122,7 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
 	play_element_sound(x, y, SAMPLE_collect, element);
 	lev.score += lev.emerald_score;
 	lev.required = lev.required < 1 ? 0 : lev.required - 1;
+	game.snapshot.collected_item = TRUE;
 	ply->anim = SPR_walk + anim;
 	break;