added support for initially moving spring to R'n'D game engine

[rocksndiamonds.git] / src / tools.c

diff --git a/src/tools.c b/src/tools.c
index 2bc7d4fe9c000c06b4b429559be9aded895a52cc..32d33f4d76d275195f200d63f5cdece94ce6142d 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -291,8 +291,6 @@ static int getLevelFromScreenX_EM(int sx)
   int px = sx - SX;
   int lx = LEVELX((px + dx) / TILESIZE_VAR);
 
-  lx = correctLevelPosX_EM(lx);
-
   return lx;
 }
 
@@ -308,8 +306,6 @@ static int getLevelFromScreenY_EM(int sy)
   int py = sy - SY;
   int ly = LEVELY((py + dy) / TILESIZE_VAR);
 
-  ly = correctLevelPosY_EM(ly);
-
   return ly;
 }
 
@@ -6540,11 +6536,11 @@ em_object_mapping_list[GAME_TILE_MAX + 1] =
   },
   {
     Xspring_e,                         FALSE,  FALSE,
-    EL_SPRING,                         -1, -1
+    EL_SPRING_RIGHT,                   -1, -1
   },
   {
     Xspring_w,                         FALSE,  FALSE,
-    EL_SPRING,                         -1, -1
+    EL_SPRING_LEFT,                    -1, -1
   },
   {
     Xspring_fall,                      FALSE,  FALSE,
@@ -6632,12 +6628,12 @@ em_object_mapping_list[GAME_TILE_MAX + 1] =
     EL_NUT,                            -1, MV_BIT_LEFT
   },
   {
-    Xpush_spring_e,                    FALSE,  FALSE,
-    EL_SPRING,                         -1, MV_BIT_RIGHT
+    Xpush_spring_e,                    TRUE,   FALSE,
+    EL_SPRING_RIGHT,                   -1, MV_BIT_RIGHT
   },
   {
-    Xpush_spring_w,                    FALSE,  FALSE,
-    EL_SPRING,                         -1, MV_BIT_LEFT
+    Xpush_spring_w,                    TRUE,   FALSE,
+    EL_SPRING_LEFT,                    -1, MV_BIT_LEFT
   },
 
   {