X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Flogic.c;h=1eaefcfc93421c0303f66dd66f7792a73c202206;hb=36b3c94a39f40ced6b0c3fed7ca40c21a2753a04;hp=4b489d8a507dee65da5f9b7c35f79bb48ec62cc2;hpb=2a4f4ada000ade47a2a04e7f7b4d1d67878a2381;p=rocksndiamonds.git

diff --git a/src/game_em/logic.c b/src/game_em/logic.c
index 4b489d8a..1eaefcfc 100644
--- a/src/game_em/logic.c
+++ b/src/game_em/logic.c
@@ -58,18 +58,6 @@ static const byte is_blank_or_acid[GAME_TILE_MAX] =
   [Xacid_8]		= 1
 };
 
-static const byte is_fake_acid[GAME_TILE_MAX] =
-{
-  [Xfake_acid_1]	= 1,
-  [Xfake_acid_2]	= 1,
-  [Xfake_acid_3]	= 1,
-  [Xfake_acid_4]	= 1,
-  [Xfake_acid_5]	= 1,
-  [Xfake_acid_6]	= 1,
-  [Xfake_acid_7]	= 1,
-  [Xfake_acid_8]	= 1
-};
-
 static const byte is_player[GAME_TILE_MAX] =
 {
   [Zplayer]		= 1,
@@ -7707,10 +7695,12 @@ void logic_move(void)
     if (ply[i].x < lev.left ||
 	ply[i].x > lev.right - 1)
     {
-      ply[i].x = (ply[i].x < lev.left ? lev.right - 1 : lev.left);
+      int direction = (ply[i].x < lev.left ? -1 : 1);
+
+      ply[i].x += -direction * lev.width;
 
       if (!lev.infinite_true)
-	ply[i].y += (ply[i].x == lev.left ? 1 : -1);
+	ply[i].y += direction;
 
       game.centered_player_nr_next = i;
       game.set_centered_player = TRUE;
@@ -7778,6 +7768,18 @@ static void logic_players(void)
       next[ply[i].x][ply[i].y] = add_player[element];
     }
   }
+
+  /* check for wheel at wrap-around position */
+  if (lev.wheel_x < lev.left ||
+      lev.wheel_x > lev.right - 1)
+  {
+    int direction = (lev.wheel_x < lev.left ? -1 : 1);
+
+    lev.wheel_x += -direction * lev.width;
+
+    if (!lev.infinite_true)
+      lev.wheel_y += direction;
+  }
 }
 
 static void logic_objects(void)