From: Holger Schemel <info@artsoft.org>
Date: Sun, 14 Mar 2004 22:44:19 +0000 (+0100)
Subject: rnd-20040314-2-src
X-Git-Tag: 3.1.0^2~50
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=23144b74723ab3166c533693bb7e5f04af36fc92;p=rocksndiamonds.git

rnd-20040314-2-src
---

diff --git a/src/conftime.h b/src/conftime.h
index 7438bad0..20f49ee9 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2004-03-14 22:31]"
+#define COMPILE_DATE_STRING "[2004-03-14 23:35]"
diff --git a/src/game.c b/src/game.c
index 0e84aa84..56094a02 100644
--- a/src/game.c
+++ b/src/game.c
@@ -8321,8 +8321,13 @@ static void CheckGravityMovement(struct PlayerInfo *player)
 {
   if (game.gravity && !player->programmed_action)
   {
+#if 1
+    int move_dir_horizontal = player->effective_action & MV_HORIZONTAL;
+    int move_dir_vertical   = player->effective_action & MV_VERTICAL;
+#else
     int move_dir_horizontal = player->action & MV_HORIZONTAL;
     int move_dir_vertical   = player->action & MV_VERTICAL;
+#endif
     int move_dir =
       (player->last_move_dir & MV_HORIZONTAL ?
        (move_dir_vertical ? move_dir_vertical : move_dir_horizontal) :
@@ -8331,7 +8336,11 @@ static void CheckGravityMovement(struct PlayerInfo *player)
     int dx = (move_dir & MV_LEFT ? -1 : move_dir & MV_RIGHT ? +1 : 0);
     int dy = (move_dir & MV_UP ? -1 : move_dir & MV_DOWN ? +1 : 0);
     int new_jx = jx + dx, new_jy = jy + dy;
+#if 1
+    boolean player_is_snapping = player->effective_action & JOY_BUTTON_1;
+#else
     boolean player_is_snapping = player->action & JOY_BUTTON_1;
+#endif
 #if 1
     boolean player_can_fall_down =
       (IN_LEV_FIELD(jx, jy + 1) &&