removed unused function parameters

[rocksndiamonds.git] / src / game.c

diff --git a/src/game.c b/src/game.c
index 4c4619c1e5bbc9e24ad51be93c846de9fa6b0a10..ce032327ab47d2837007a85944a8940a30d83ca6 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -1784,7 +1784,7 @@ static void InitPlayerField(int x, int y, int element, boolean init_game)
       player->active = TRUE;
 
       // remove potentially duplicate players
-      if (StorePlayer[jx][jy] == Tile[x][y])
+      if (IN_LEV_FIELD(jx, jy) && StorePlayer[jx][jy] == Tile[x][y])
        StorePlayer[jx][jy] = 0;
 
       StorePlayer[x][y] = Tile[x][y];
@@ -4777,6 +4777,8 @@ static void LevelSolved(void)
   game.LevelSolved = TRUE;
   game.GameOver = TRUE;
 
+  tape.solved = TRUE;
+
   // needed here to display correct panel values while player walks into exit
   LevelSolved_SetFinalGameValues();
 }
@@ -11988,25 +11990,23 @@ void GameActions(void)
 void GameActions_EM_Main(void)
 {
   byte effective_action[MAX_PLAYERS];
-  boolean warp_mode = (tape.playing && tape.warp_forward && !tape.pausing);
   int i;
 
   for (i = 0; i < MAX_PLAYERS; i++)
     effective_action[i] = stored_player[i].effective_action;
 
-  GameActions_EM(effective_action, warp_mode);
+  GameActions_EM(effective_action);
 }
 
 void GameActions_SP_Main(void)
 {
   byte effective_action[MAX_PLAYERS];
-  boolean warp_mode = (tape.playing && tape.warp_forward && !tape.pausing);
   int i;
 
   for (i = 0; i < MAX_PLAYERS; i++)
     effective_action[i] = stored_player[i].effective_action;
 
-  GameActions_SP(effective_action, warp_mode);
+  GameActions_SP(effective_action);
 
   for (i = 0; i < MAX_PLAYERS; i++)
   {
@@ -12019,9 +12019,7 @@ void GameActions_SP_Main(void)
 
 void GameActions_MM_Main(void)
 {
-  boolean warp_mode = (tape.playing && tape.warp_forward && !tape.pausing);
-
-  GameActions_MM(local_player->effective_mouse_action, warp_mode);
+  GameActions_MM(local_player->effective_mouse_action);
 }
 
 void GameActions_RND_Main(void)