X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=30af0fcbbd7a50affb604b234f7da58d87e9e1bd;hb=842f9050c68d9c9f0741e444a052e00cf81ee90b;hp=4ea608c3ac6f45538768a1b56453e62c0a73db78;hpb=5ec67e956f52fc441582d30b4748d44febdbeed6;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index 4ea608c3..30af0fcb 100644
--- a/src/game.c
+++ b/src/game.c
@@ -107,7 +107,7 @@
 					(condition)))
 
 #define ELEMENT_CAN_ENTER_FIELD(e, x, y)				\
-	ELEMENT_CAN_ENTER_FIELD_GENERIC(e, x, y, 1)
+	ELEMENT_CAN_ENTER_FIELD_GENERIC(e, x, y, 0)
 
 #define ELEMENT_CAN_ENTER_FIELD_OR_ACID(e, x, y)			\
 	ELEMENT_CAN_ENTER_FIELD_GENERIC(e, x, y, (Feld[x][y] == EL_ACID))
@@ -750,6 +750,33 @@ static void InitGameEngine()
     if (HAS_CHANGE_EVENT(i, CE_BY_OTHER))
       trigger_events[element_info[i].change.trigger] |=
 	element_info[i].change.events;
+
+  /* set push delay value for all non-custom elements */
+  for (i=0; i<MAX_NUM_ELEMENTS; i++)
+  {
+    if (!IS_CUSTOM_ELEMENT(i))
+    {
+      if (i == EL_SPRING ||
+	  i == EL_BALLOON)
+      {
+	element_info[i].push_delay_fixed = 0;
+	element_info[i].push_delay_random = 0;
+      }
+      else if (i == EL_SOKOBAN_OBJECT ||
+	       i == EL_SOKOBAN_FIELD_FULL ||
+	       i == EL_SATELLITE ||
+	       i == EL_SP_DISK_YELLOW)
+      {
+	element_info[i].push_delay_fixed = 2;
+	element_info[i].push_delay_random = 0;
+      }
+      else
+      {
+	element_info[i].push_delay_fixed = 2;
+	element_info[i].push_delay_random = 8;
+      }
+    }
+  }
 }
 
 
@@ -907,6 +934,7 @@ void InitGame()
       AmoebaNr[x][y] = 0;
       JustStopped[x][y] = 0;
       Stop[x][y] = FALSE;
+      Pushed[x][y] = FALSE;
       ExplodePhase[x][y] = 0;
       ExplodeField[x][y] = EX_NO_EXPLOSION;
 
@@ -1211,7 +1239,9 @@ void InitMovDir(int x, int y)
       {
 	if (element_info[element].move_direction_initial != MV_NO_MOVING)
 	  MovDir[x][y] = element_info[element].move_direction_initial;
-	else if (element_info[element].move_pattern == MV_ALL_DIRECTIONS)
+	else if (element_info[element].move_pattern == MV_ALL_DIRECTIONS ||
+		 element_info[element].move_pattern == MV_TURNING_LEFT ||
+		 element_info[element].move_pattern == MV_TURNING_RIGHT)
 	  MovDir[x][y] = 1 << RND(4);
 	else if (element_info[element].move_pattern == MV_HORIZONTAL)
 	  MovDir[x][y] = (RND(2) ? MV_LEFT : MV_RIGHT);
@@ -1601,6 +1631,7 @@ static void RemoveField(int x, int y)
   MovDir[x][y] = 0;
   MovDelay[x][y] = 0;
   ChangeDelay[x][y] = 0;
+  Pushed[x][y] = FALSE;
 }
 
 void RemoveMovingField(int x, int y)
@@ -3016,12 +3047,18 @@ void TurnRound(int x, int y)
       }
     }
   }
-  else if (element_info[element].move_pattern == MV_ALL_DIRECTIONS)
+  else if (element_info[element].move_pattern == MV_ALL_DIRECTIONS ||
+	   element_info[element].move_pattern == MV_TURNING_LEFT ||
+	   element_info[element].move_pattern == MV_TURNING_RIGHT)
   {
     boolean can_turn_left  = ELEMENT_CAN_ENTER_FIELD(element, left_x, left_y);
     boolean can_turn_right = ELEMENT_CAN_ENTER_FIELD(element, right_x,right_y);
 
-    if (can_turn_left && can_turn_right)
+    if (element_info[element].move_pattern == MV_TURNING_LEFT)
+      MovDir[x][y] = left_dir;
+    else if (element_info[element].move_pattern == MV_TURNING_RIGHT)
+      MovDir[x][y] = right_dir;
+    else if (can_turn_left && can_turn_right)
       MovDir[x][y] = (RND(3) ? (RND(2) ? left_dir : right_dir) : back_dir);
     else if (can_turn_left)
       MovDir[x][y] = (RND(2) ? left_dir : back_dir);
@@ -3315,12 +3352,21 @@ void StartMoving(int x, int y)
 #endif
     }
 #if 1
+#if 1
+    else if (game.engine_version < RELEASE_IDENT(2,2,0,7) &&
+	     CAN_SMASH(element) && Feld[x][y + 1] == EL_BLOCKED &&
+	     JustStopped[x][y] && !Pushed[x][y + 1])
+#else
     else if (CAN_SMASH(element) && Feld[x][y + 1] == EL_BLOCKED &&
 	     JustStopped[x][y])
+#endif
     {
-      /*
-      printf("::: %d\n", MovDir[x][y]);
-      */
+      /* calling "Impact()" here is not only completely unneccessary
+	 (because it already gets called from "ContinueMoving()" in
+	 all relevant situations), but also completely bullshit, because
+	 "JustStopped" also indicates a finished *horizontal* movement;
+	 we must keep this trash for backwards compatibility with older
+	 tapes */
 
       Impact(x, y);
     }
@@ -3403,7 +3449,7 @@ void StartMoving(int x, int y)
     }
   }
 
-  /* not "else if" because of EL_SPRING */
+  /* not "else if" because of elements that can fall and move (EL_SPRING) */
   if (CAN_MOVE(element) && !started_moving)
   {
     int newx, newy;
@@ -3436,7 +3482,9 @@ void StartMoving(int x, int y)
       if (element != EL_YAMYAM &&
 	  element != EL_DARK_YAMYAM &&
 	  element != EL_PACMAN &&
-	  !(element_info[element].move_pattern & MV_ANY_DIRECTION))
+	  !(element_info[element].move_pattern & MV_ANY_DIRECTION) &&
+	  element_info[element].move_pattern != MV_TURNING_LEFT &&
+	  element_info[element].move_pattern != MV_TURNING_RIGHT)
       {
 	TurnRound(x, y);
 
@@ -3828,7 +3876,11 @@ void ContinueMoving(int x, int y)
   MovPos[x][y] += step;
 
 #if 1
+#if 1
+  if (Pushed[x][y])	/* special case: moving object pushed by player */
+#else
   if (pushing)		/* special case: moving object pushed by player */
+#endif
 #if 1
     MovPos[x][y] = SIGN(MovPos[x][y]) * (TILEX - ABS(PLAYERINFO(x,y)->MovPos));
 #else
@@ -3922,6 +3974,16 @@ void ContinueMoving(int x, int y)
       Feld[x][y] = get_next_element(element);
       element = Feld[newx][newy] = Store[x][y];
     }
+    else if (element == EL_SOKOBAN_OBJECT)
+    {
+      if (Back[x][y])
+	Feld[x][y] = Back[x][y];
+
+      if (Back[newx][newy])
+	Feld[newx][newy] = EL_SOKOBAN_FIELD_FULL;
+
+      Back[x][y] = Back[newx][newy] = 0;
+    }
     else if (Store[x][y] == EL_ACID)
     {
       element = Feld[newx][newy] = EL_ACID;
@@ -3939,22 +4001,34 @@ void ContinueMoving(int x, int y)
     GfxAction[newx][newy] = GfxAction[x][y];	/* keep action one frame */
     GfxRandom[newx][newy] = GfxRandom[x][y];	/* keep same random value */
 
+    Pushed[x][y] = Pushed[newx][newy] = FALSE;
+
     ResetGfxAnimation(x, y);	/* reset animation values for old field */
 
 #if 1
 #if 0
+    /* 2.1.1 (does not work correctly for spring) */
     if (!CAN_MOVE(element))
       MovDir[newx][newy] = 0;
 #else
-    /*
+
+#if 0
+    /* (does not work for falling objects that slide horizontally) */
     if (CAN_FALL(element) && MovDir[newx][newy] == MV_DOWN)
       MovDir[newx][newy] = 0;
+#else
+    /*
+    if (!CAN_MOVE(element) ||
+	(element == EL_SPRING && MovDir[newx][newy] == MV_DOWN))
+      MovDir[newx][newy] = 0;
     */
 
     if (!CAN_MOVE(element) ||
-	(element == EL_SPRING && MovDir[newx][newy] == MV_DOWN))
+	(CAN_FALL(element) && MovDir[newx][newy] == MV_DOWN))
       MovDir[newx][newy] = 0;
 #endif
+
+#endif
 #endif
 
     DrawLevelField(x, y);
@@ -5010,7 +5084,12 @@ static void CheckPlayerElementChange(int x, int y, int element,
   if (!CAN_CHANGE(element) || !HAS_CHANGE_EVENT(element, trigger_event))
     return;
 
+#if 1
+  ChangeDelay[x][y] = 1;
+  ChangeElement(x, y);
+#else
   ChangeElementDoIt(x, y, element_info[element].change.successor);
+#endif
 }
 
 static void PlayerActions(struct PlayerInfo *player, byte player_action)
@@ -6366,6 +6445,7 @@ static boolean checkDiagonalPushing(struct PlayerInfo *player,
 int DigField(struct PlayerInfo *player,
 	     int x, int y, int real_dx, int real_dy, int mode)
 {
+  boolean use_spring_bug = (game.engine_version < VERSION_IDENT(2,2,0));
   int jx = player->jx, jy = player->jy;
   int dx = x - jx, dy = y - jy;
   int move_direction = (dx == -1 ? MV_LEFT :
@@ -6760,6 +6840,8 @@ int DigField(struct PlayerInfo *player,
       return MF_ACTION;
       break;
 
+#if 0
+
       /* the following elements cannot be pushed by "snapping" */
     case EL_ROCK:
     case EL_BOMB:
@@ -6779,6 +6861,10 @@ int DigField(struct PlayerInfo *player,
       if (dy)
 	return MF_NO_ACTION;
 
+      if (CAN_FALL(element) && IN_LEV_FIELD(x, y + 1) && IS_FREE(x, y + 1) &&
+	  !(element == EL_SPRING && use_spring_bug))
+	return MF_NO_ACTION;
+
       player->Pushing = TRUE;
 
 #if 0
@@ -6853,6 +6939,8 @@ int DigField(struct PlayerInfo *player,
 
       break;
 
+#endif
+
     case EL_GATE_1:
     case EL_GATE_2:
     case EL_GATE_3:
@@ -7037,6 +7125,8 @@ int DigField(struct PlayerInfo *player,
       return MF_ACTION;
       break;
 
+#if 0
+
 #if 0
     case EL_SOKOBAN_FIELD_EMPTY:
       break;
@@ -7076,6 +7166,44 @@ int DigField(struct PlayerInfo *player,
 
       if (IS_SB_ELEMENT(element))
       {
+#if 1
+	if (element == EL_SOKOBAN_FIELD_FULL)
+	{
+	  Back[x][y] = EL_SOKOBAN_FIELD_EMPTY;
+	  local_player->sokobanfields_still_needed++;
+	}
+
+	if (Feld[x + dx][y + dy] == EL_SOKOBAN_FIELD_EMPTY)
+	{
+	  Back[x + dx][y + dy] = EL_SOKOBAN_FIELD_EMPTY;
+	  local_player->sokobanfields_still_needed--;
+	}
+
+	Feld[x][y] = EL_SOKOBAN_OBJECT;
+
+	if (Back[x][y] == Back[x + dx][y + dy])
+	  PlaySoundLevelAction(x, y, ACTION_PUSHING);
+	else if (Back[x][y] != 0)
+	  PlaySoundLevelElementAction(x, y, EL_SOKOBAN_FIELD_FULL,
+				      ACTION_EMPTYING);
+	else
+	  PlaySoundLevelElementAction(x + dx, y + dy, EL_SOKOBAN_FIELD_EMPTY,
+				      ACTION_FILLING);
+
+	InitMovingField(x, y, (dx < 0 ? MV_LEFT :
+			       dx > 0 ? MV_RIGHT :
+			       dy < 0 ? MV_UP : MV_DOWN));
+	MovPos[x][y] = (dx != 0 ? dx : dy);
+
+#if 0
+	printf("::: %s -> %s [%s -> %s]\n",
+	       element_info[Feld[x][y]].token_name,
+	       element_info[Feld[x + dx][y + dy]].token_name,
+	       element_info[Back[x][y]].token_name,
+	       element_info[Back[x + dx][y + dy]].token_name);
+#endif
+
+#else
 	if (element == EL_SOKOBAN_FIELD_FULL)
 	{
 	  Feld[x][y] = EL_SOKOBAN_FIELD_EMPTY;
@@ -7117,11 +7245,19 @@ int DigField(struct PlayerInfo *player,
 	    PlaySoundLevel(x, y, SND_SOKOBAN_OBJECT_PUSHING);
 #endif
 	}
+#endif
       }
       else
       {
+#if 1
+	InitMovingField(x, y, (dx < 0 ? MV_LEFT :
+			       dx > 0 ? MV_RIGHT :
+			       dy < 0 ? MV_UP : MV_DOWN));
+	MovPos[x][y] = (dx != 0 ? dx : dy);
+#else
 	RemoveField(x, y);
-	Feld[x+dx][y+dy] = element;
+	Feld[x + dx][y + dy] = element;
+#endif
 	PlaySoundLevelElementAction(x, y, element, ACTION_PUSHING);
       }
 
@@ -7142,6 +7278,8 @@ int DigField(struct PlayerInfo *player,
 
       break;
 
+#endif
+
     case EL_PENGUIN:
     case EL_PIG:
     case EL_DRAGON:
@@ -7189,19 +7327,29 @@ int DigField(struct PlayerInfo *player,
       }
       else if (IS_PUSHABLE(element))
       {
-	if (mode == DF_SNAP)
+	if (mode == DF_SNAP && element != EL_BD_ROCK)
 	  return MF_NO_ACTION;
 
 	if (CAN_FALL(element) && dy)
 	  return MF_NO_ACTION;
 
+	if (CAN_FALL(element) && IN_LEV_FIELD(x, y + 1) && IS_FREE(x, y + 1) &&
+	    !(element == EL_SPRING && use_spring_bug))
+	  return MF_NO_ACTION;
+
+	if (element == EL_SPRING && MovDir[x][y] != MV_NO_MOVING)
+	  return MF_NO_ACTION;
+
 	if (!player->Pushing &&
 	    game.engine_version >= RELEASE_IDENT(2,2,0,7))
 	  player->push_delay_value = GET_NEW_PUSH_DELAY(element);
 
 	player->Pushing = TRUE;
 
-	if (!IN_LEV_FIELD(x + dx, y + dy) || !IS_FREE(x + dx, y + dy))
+	if (!(IN_LEV_FIELD(x + dx, y + dy) &&
+	      (IS_FREE(x + dx, y + dy) ||
+	       (Feld[x + dx][y + dy] == EL_SOKOBAN_FIELD_EMPTY &&
+		IS_SB_ELEMENT(element)))))
 	  return MF_NO_ACTION;
 
 	if (!checkDiagonalPushing(player, x, y, real_dx, real_dy))
@@ -7211,31 +7359,60 @@ int DigField(struct PlayerInfo *player,
 	  player->push_delay = FrameCounter;
 
 	if (!FrameReached(&player->push_delay, player->push_delay_value) &&
-	    !(tape.playing && tape.file_version < FILE_VERSION_2_0))
+	    !(tape.playing && tape.file_version < FILE_VERSION_2_0) &&
+	    element != EL_SPRING && element != EL_BALLOON)
 	  return MF_NO_ACTION;
 
-#if 1
-	InitMovingField(x, y, (dx < 0 ? MV_LEFT :
-			       dx > 0 ? MV_RIGHT :
-			       dy < 0 ? MV_UP : MV_DOWN));
-	MovPos[x][y] = (dx != 0 ? dx : dy);
-#else
-	RemoveField(x, y);
-	Feld[x + dx][y + dy] = element;
-#endif
+	if (IS_SB_ELEMENT(element))
+	{
+	  if (element == EL_SOKOBAN_FIELD_FULL)
+	  {
+	    Back[x][y] = EL_SOKOBAN_FIELD_EMPTY;
+	    local_player->sokobanfields_still_needed++;
+	  }
+
+	  if (Feld[x + dx][y + dy] == EL_SOKOBAN_FIELD_EMPTY)
+	  {
+	    Back[x + dx][y + dy] = EL_SOKOBAN_FIELD_EMPTY;
+	    local_player->sokobanfields_still_needed--;
+	  }
+
+	  Feld[x][y] = EL_SOKOBAN_OBJECT;
+
+	  if (Back[x][y] == Back[x + dx][y + dy])
+	    PlaySoundLevelAction(x, y, ACTION_PUSHING);
+	  else if (Back[x][y] != 0)
+	    PlaySoundLevelElementAction(x, y, EL_SOKOBAN_FIELD_FULL,
+					ACTION_EMPTYING);
+	  else
+	    PlaySoundLevelElementAction(x + dx, y + dy, EL_SOKOBAN_FIELD_EMPTY,
+					ACTION_FILLING);
+
+	  if (local_player->sokobanfields_still_needed == 0 &&
+	      game.emulation == EMU_SOKOBAN)
+	  {
+	    player->LevelSolved = player->GameOver = TRUE;
+	    PlaySoundLevel(x, y, SND_GAME_SOKOBAN_SOLVING);
+	  }
+	}
+	else
+	  PlaySoundLevelElementAction(x, y, element, ACTION_PUSHING);
+
+	InitMovingField(x, y, move_direction);
+
+	if (mode == DF_SNAP)
+	  ContinueMoving(x, y);
+	else
+	  MovPos[x][y] = (dx != 0 ? dx : dy);
+
+	Pushed[x][y] = TRUE;
+	Pushed[x + dx][y + dy] = TRUE;
 
-#if 1
 	if (game.engine_version < RELEASE_IDENT(2,2,0,7))
 	  player->push_delay_value = GET_NEW_PUSH_DELAY(element);
-#else
-	player->push_delay_value = 2 + RND(8);
-#endif
-
-	DrawLevelField(x + dx, y + dy);
-	PlaySoundLevelElementAction(x, y, element, ACTION_PUSHING);
 
 	CheckTriggeredElementChange(element, CE_OTHER_PUSHING);
-	CheckPlayerElementChange(x + dx, y + dy, element, CE_PUSHED_BY_PLAYER);
+	CheckPlayerElementChange(x, y, element, CE_PUSHED_BY_PLAYER);
 
 	break;
       }