rnd-20030823-1-src

diff --git a/CHANGES b/CHANGES
index 347e1d7d16faec704bd70b536134da21d1e10acb..3f2aa6d782df95194c25a2afdd8f04277e61e571 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+Release Version 3.0.3 [?? ??? ????]
+-----------------------------------
+       - fixed bug (missing boundary check) which could crash the game
+
 Release Version 3.0.2 [22 AUG 2003]
 -----------------------------------
        - fixed bug with messing up custom element properties in 3.0.0 levels

diff --git a/src/Makefile b/src/Makefile
index ff28877633b2b653aa14aa87f2e396da2af41c55..595f5996acb4a4770dcf80e888de840d08f2ee3d 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -103,7 +103,7 @@ CONFIG_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR)
 
 
 CONFIG = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(JOYSTICK)
-# DEBUG = -DDEBUG -g
+DEBUG = -DDEBUG -g
 # PROFILING = $(PROFILING_FLAGS)
 
 # OPTIONS = $(DEBUG) -Wall                     # only for debugging purposes

diff --git a/src/conftime.h b/src/conftime.h
index 6d2a47a8bc5ff800e6182e5f3bf39f90e561c62e..a6529f2d6ceb76d19139fe7949b208c9073167d6 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2003-08-21 23:55]"
+#define COMPILE_DATE_STRING "[2003-08-23 14:29]"

diff --git a/src/game.c b/src/game.c
index 74c934d291b4284f04e963b5b53d3f911edb69a8..016452604f6d734b9e88e55f78561a786fc37f8f 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -3620,7 +3620,8 @@ void StartMoving(int x, int y)
 
   if (CAN_FALL(element) && y < lev_fieldy - 1)
   {
-    if ((x>0 && IS_PLAYER(x-1, y)) || (x<lev_fieldx-1 && IS_PLAYER(x+1, y)))
+    if ((x > 0 && IS_PLAYER(x - 1, y)) ||
+       (x < lev_fieldx-1 && IS_PLAYER(x + 1, y)))
       if (JustBeingPushed(x, y))
        return;
 
@@ -4021,7 +4022,8 @@ void StartMoving(int x, int y)
 
     Moving2Blocked(x, y, &newx, &newy);        /* get next screen position */
 
-    if (DONT_COLLIDE_WITH(element) && IS_PLAYER(newx, newy) &&
+    if (DONT_COLLIDE_WITH(element) &&
+       IN_LEV_FIELD(newx, newy) && IS_PLAYER(newx, newy) &&
        !PLAYER_PROTECTED(newx, newy))
     {
 #if 1

diff --git a/src/main.h b/src/main.h
index 5a9ef38886b5bbe8996832e4c990616b5213d3f5..cab4e71de89b87402187f46a0fdcf9192565ada2 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -980,9 +980,9 @@
 
 #define PROGRAM_VERSION_MAJOR  3
 #define PROGRAM_VERSION_MINOR  0
-#define PROGRAM_VERSION_PATCH  2
+#define PROGRAM_VERSION_PATCH  3
 #define PROGRAM_VERSION_RELEASE        0
-#define PROGRAM_VERSION_STRING "3.0.2"
+#define PROGRAM_VERSION_STRING "3.0.3"
 
 #define PROGRAM_TITLE_STRING   "Rocks'n'Diamonds"
 #define PROGRAM_AUTHOR_STRING  "Holger Schemel"