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

diff --git a/src/game_em/synchro_1.c b/src/game_em/synchro_1.c
index a8ff691a..3f7643fb 100644
--- a/src/game_em/synchro_1.c
+++ b/src/game_em/synchro_1.c
@@ -12,6 +12,7 @@
 
 
 static void player(struct PLAYER *);
+static boolean player_digfield(struct PLAYER *, int, int);
 static int test(struct PLAYER *);
 static void die(struct PLAYER *);
 
@@ -87,8 +88,8 @@ static int test(struct PLAYER *ply)
   if (!ply->alive)
     return 0;
 
-  if (lev.time == 0)
-    return(1);
+  if (lev.time_initial > 0 && lev.time == 0)
+    return 1;
 
   switch(Cave[y-1][x])
   {
@@ -108,7 +109,7 @@ static int test(struct PLAYER *ply)
     case Xtank_goe:
     case Xtank_gos:
     case Xtank_gow:
-      return(1);
+      return 1;
   }
 
   switch(Cave[y][x+1])
@@ -129,7 +130,7 @@ static int test(struct PLAYER *ply)
     case Xtank_goe:
     case Xtank_gos:
     case Xtank_gow:
-      return(1);
+      return 1;
   }
 
   switch(Cave[y+1][x])
@@ -150,7 +151,7 @@ static int test(struct PLAYER *ply)
     case Xtank_goe:
     case Xtank_gos:
     case Xtank_gow:
-      return(1);
+      return 1;
   }
 
   switch(Cave[y][x-1])
@@ -171,7 +172,7 @@ static int test(struct PLAYER *ply)
     case Xtank_goe:
     case Xtank_gos:
     case Xtank_gow:
-      return(1);
+      return 1;
   }
 
   switch(Cave[y][x])
@@ -184,10 +185,10 @@ static int test(struct PLAYER *ply)
     case Xdynamite_2:
     case Xdynamite_3:
     case Xdynamite_4:
-      return(0);
+      return 0;
   }
 
-  return(1);
+  return 1;
 }
 
 static void die(struct PLAYER *ply)
@@ -340,79 +341,109 @@ static void die(struct PLAYER *ply)
 
 static void player(struct PLAYER *ply)
 {
-  register unsigned int x = ply->x;
-  register unsigned int y = ply->y;
-  unsigned int anim = 0;	/* initialized to make compilers happy */
+  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 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
+
+#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)
+    if (ply->joy_n)		/* north */
     {
       y--;
       dy = -1;
       anim = 0;
-      /* north */
     }
-    else if (ply->joy_e)
+    else if (ply->joy_e)	/* east */
     {
       x++;
       dx = 1;
       anim = 1;
-      /* east */
     }
-    else if (ply->joy_s)
+    else if (ply->joy_s)	/* south */
     {
       y++;
       dy = 1;
       anim = 2;
-      /* south */
     }
-    else if (ply->joy_w)
+    else if (ply->joy_w)	/* west */
     {
       x--;
       dx = -1;
       anim = 3;
-      /* west */
     }
   }
   else
   {
-    if (ply->joy_w)
+    if (ply->joy_w)		/* west */
     {
       x--;
       dx = -1;
       anim = 3;
-      /* west */
     }
-    else if (ply->joy_s)
+    else if (ply->joy_s)	/* south */
     {
       y++;
       dy = 1;
       anim = 2;
-      /* south */
     }
-    else if (ply->joy_e)
+    else if (ply->joy_e)	/* east */
     {
       x++;
       dx = 1;
       anim = 1;
-      /* east */
     }
-    else if (ply->joy_n)
+    else if (ply->joy_n)	/* north */
     {
       y--;
       dy = -1;
       anim = 0;
-      /* north */
     }
   }
+#endif
 
   if (dx == 0 && dy == 0)
   {
     ply->joy_stick = 0;
 
-    if (ply->joy_fire)
+    if (ply->joy_drop)
     {
       if (++ply->dynamite_cnt == 5 && ply->dynamite)
       {
@@ -426,7 +457,7 @@ static void player(struct PLAYER *ply)
       ply->dynamite_cnt = 0;
     }
 
-    Random += 7; /* bit more random if we dont move */
+    Random += 7;	/* be a bit more random if the player doesn't move */
 
     return;
   }
@@ -434,8 +465,53 @@ static void 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->joy_spin = !ply->joy_spin;
+
+  if (ply->joy_snap == 0)		/* player wants to move */
+  {
+    boolean moved = FALSE;
+
+    if (ply->last_move_dir & MV_HORIZONTAL)
+    {
+      if (!(moved = player_digfield(ply, 0, dy)))
+	moved = player_digfield(ply, dx, 0);
+    }
+    else
+    {
+      if (!(moved = player_digfield(ply, dx, 0)))
+	moved = player_digfield(ply, 0, dy);
+    }
+
+    if (moved)
+    {
+      if (oldx != ply->x)
+	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);
+    }
+  }
+  else					/* player wants to snap */
+  {
+    player_digfield(ply, dx, dy);
+  }
+}
+
+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;
+  boolean result = TRUE;
+
+  if (!dx && !dy)			/* no direction specified */
+    return FALSE;
+
+  if (dx && dy && ply->joy_snap)	/* more than one direction specified */
+    return FALSE;
 
-  if (ply->joy_fire == 0)
+  if (ply->joy_snap == 0)		/* player wants to move */
   {
     int element = Cave[y][x];
 
@@ -541,39 +617,46 @@ static void player(struct PLAYER *ply)
 
       case Xkey_1:
 	ply->keys |= 0x01;
+	Cave[y][x] = Ykey_1_eat;
 	goto key_walk;
 
       case Xkey_2:
 	ply->keys |= 0x02;
+	Cave[y][x] = Ykey_2_eat;
 	goto key_walk;
 
       case Xkey_3:
 	ply->keys |= 0x04;
+	Cave[y][x] = Ykey_3_eat;
 	goto key_walk;
 
       case Xkey_4:
 	ply->keys |= 0x08;
+	Cave[y][x] = Ykey_4_eat;
 	goto key_walk;
 
       case Xkey_5:
 	ply->keys |= 0x10;
+	Cave[y][x] = Ykey_5_eat;
 	goto key_walk;
 
       case Xkey_6:
 	ply->keys |= 0x20;
+	Cave[y][x] = Ykey_6_eat;
 	goto key_walk;
 
       case Xkey_7:
 	ply->keys |= 0x40;
+	Cave[y][x] = Ykey_7_eat;
 	goto key_walk;
 
       case Xkey_8:
 	ply->keys |= 0x80;
+	Cave[y][x] = Ykey_8_eat;
 	goto key_walk;
 
       key_walk:
 
-	Cave[y][x] = Yball_eat;
 	Next[y][x] = Zplayer;
 	play_element_sound(x, y, SAMPLE_collect, element);
 	lev.score += lev.key_score;
@@ -583,7 +666,7 @@ static void player(struct PLAYER *ply)
 	break;
 
       case Xlenses:
-	Cave[y][x] = Yball_eat;
+	Cave[y][x] = Ylenses_eat;
 	Next[y][x] = Zplayer;
 	play_element_sound(x, y, SAMPLE_collect, element);
 	lev.score += lev.lenses_score;
@@ -594,7 +677,7 @@ static void player(struct PLAYER *ply)
 	break;
 
       case Xmagnify:
-	Cave[y][x] = Yball_eat;
+	Cave[y][x] = Ymagnify_eat;
 	Next[y][x] = Zplayer;
 	play_element_sound(x, y, SAMPLE_collect, element);
 	lev.score += lev.magnify_score;
@@ -987,15 +1070,21 @@ static void player(struct PLAYER *ply)
       case Xexit_2:
       case Xexit_3:
 	play_element_sound(x, y, SAMPLE_exit, Xexit_1);
-	if (--lev.home == 0)
+
+	if (--lev.home == 0 && lev.time_initial > 0)	/* game won */
 	  lev.score += lev.time * lev.exit_score / 100;
+
 	ply->anim = SPR_walk + anim;
 	ply->x = x;
 	ply->y = y;
+
 	break;
     }
+
+    if (ply->x == oldx && ply->y == oldy)	/* no movement */
+      result = FALSE;
   }
-  else
+  else					/* player wants to snap */
   {
     int element = Cave[y][x];
 
@@ -1004,8 +1093,14 @@ static void player(struct PLAYER *ply)
       /* fire is pressed */
 
       case Xgrass:
+	Cave[y][x] = Ygrass_eat;
+	Next[y][x] = Xblank;
+	play_element_sound(x, y, SAMPLE_dirt, element);
+	ply->anim = SPR_spray + anim;
+	break;
+
       case Xdirt:
-	Cave[y][x] = Yball_eat;
+	Cave[y][x] = Ydirt_eat;
 	Next[y][x] = Xblank;
 	play_element_sound(x, y, SAMPLE_dirt, element);
 	ply->anim = SPR_spray + anim;
@@ -1042,38 +1137,45 @@ static void player(struct PLAYER *ply)
 
       case Xkey_1:
 	ply->keys |= 0x01;
+	Cave[y][x] = Ykey_1_eat;
 	goto key_shoot;
 
       case Xkey_2:
 	ply->keys |= 0x02;
+	Cave[y][x] = Ykey_2_eat;
 	goto key_shoot;
 
       case Xkey_3:
 	ply->keys |= 0x04;
+	Cave[y][x] = Ykey_3_eat;
 	goto key_shoot;
 
       case Xkey_4:
 	ply->keys |= 0x08;
+	Cave[y][x] = Ykey_4_eat;
 	goto key_shoot;
 
       case Xkey_5:
 	ply->keys |= 0x10;
+	Cave[y][x] = Ykey_5_eat;
 	goto key_shoot;
 
       case Xkey_6:
 	ply->keys |= 0x20;
+	Cave[y][x] = Ykey_6_eat;
 	goto key_shoot;
 
       case Xkey_7:
 	ply->keys |= 0x40;
+	Cave[y][x] = Ykey_7_eat;
 	goto key_shoot;
 
       case Xkey_8:
 	ply->keys |= 0x80;
+	Cave[y][x] = Ykey_8_eat;
 	goto key_shoot;
 
       key_shoot:
-	Cave[y][x] = Yball_eat;
 	Next[y][x] = Xblank;
 	play_element_sound(x, y, SAMPLE_collect, element);
 	lev.score += lev.key_score;
@@ -1081,7 +1183,7 @@ static void player(struct PLAYER *ply)
 	break;
 
       case Xlenses:
-	Cave[y][x] = Yball_eat;
+	Cave[y][x] = Ylenses_eat;
 	Next[y][x] = Xblank;
 	play_element_sound(x, y, SAMPLE_collect, element);
 	lev.score += lev.lenses_score;
@@ -1090,13 +1192,18 @@ static void player(struct PLAYER *ply)
 	break;
 
       case Xmagnify:
-	Cave[y][x] = Yball_eat;
+	Cave[y][x] = Ymagnify_eat;
 	Next[y][x] = Xblank;
 	play_element_sound(x, y, SAMPLE_collect, element);
 	lev.score += lev.magnify_score;
 	lev.magnify_cnt = lev.magnify_time;
 	ply->anim = SPR_walk + anim;
 	break;
+
+      default:
+	result = FALSE;
     }
   }
+
+  return result;
 }