rnd-20020520-1-src

diff --git a/CHANGES b/CHANGES
index e59d98d45faeef231edef829b7f4b318d6cede26..b998ba6cce7df01372aca666d182d32300c13b65 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,11 @@
-Release Version 2.0.2 [XX XXX XXXX]
+Release Version 2.1.0 [XX XXX XXXX]
 -----------------------------------
+       - bug fixed that prevented walking through tubes when gravity on
+       - enhanced sound system (especially regarding stereo and loop sounds)
+       - new structured setup menu (with sob-menues for graphics and sounds)
+       - graphics, sounds and music now fully configurable
        - added support for TrueColor PCX graphics files
+       - added "quick save" and "quick load" functions with shortcut key
        - changed default slipping behaviour of gems back to 2.0.0 style;
          this is now an element property for gems in the level editor,
          although existing converted levels use the new EM gems behaviour

diff --git a/src/game.c b/src/game.c
index fc53f25664253a9b30952f60ff8262bffc418041..3c81e2990242bff9d88c77e8b4980087209640e5 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -5064,7 +5064,9 @@ static void CheckGravityMovement(struct PlayerInfo *player)
        (Feld[new_jx][new_jy] == EL_SP_BASE ||
        Feld[new_jx][new_jy] == EL_ERDREICH));
 
-    if (field_under_player_is_free && !player_is_moving_to_valid_field)
+    if (field_under_player_is_free &&
+       !player_is_moving_to_valid_field &&
+       !IS_TUBE(Feld[jx][jy]))
       player->programmed_action = MV_DOWN;
   }
 }

diff --git a/src/main.h b/src/main.h
index 06939a398df30bc899564779bf0aef5134cc2427..dbeb50216608fe573c6a96fd3e7009361c7944dd 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -1601,7 +1601,7 @@ extern int                num_element_info;
 #define PROGRAM_VERSION_MAJOR  2
 #define PROGRAM_VERSION_MINOR  0
 #define PROGRAM_VERSION_PATCH  2
-#define PROGRAM_VERSION_STRING "2.0.2"
+#define PROGRAM_VERSION_STRING "2.1.0"
 
 #define PROGRAM_TITLE_STRING   "Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING  "Holger Schemel"

diff --git a/src/timestamp.h b/src/timestamp.h
index 18c401c98203cb648e55e4eaffaa776bc1607210..78e001e5fc27383b3a923d93836e3b0e44365ec1 100644 (file)
--- a/src/timestamp.h
+++ b/src/timestamp.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2002-05-19 20:35]"
+#define COMPILE_DATE_STRING "[2002-05-19 22:16]"