From: Holger Schemel <info@artsoft.org>
Date: Sat, 23 Aug 2003 12:31:54 +0000 (+0200)
Subject: rnd-20030823-1-src
X-Git-Tag: 3.0.3^2~15
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=9028fc1280e47a368d8778157403b4216a89e036;p=rocksndiamonds.git

rnd-20030823-1-src
---

diff --git a/CHANGES b/CHANGES
index 347e1d7d..3f2aa6d7 100644
--- 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 ff288776..595f5996 100644
--- 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 6d2a47a8..a6529f2d 100644
--- 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 74c934d2..01645260 100644
--- 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 5a9ef388..cab4e71d 100644
--- 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"