From: Holger Schemel <info@artsoft.org>
Date: Tue, 3 Oct 2006 08:03:09 +0000 (+0200)
Subject: rnd-20061003-1-src
X-Git-Tag: 3.2.3^2~39
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=e05e97eef55da1c82b493d0ca20a868e8e189413;p=rocksndiamonds.git

rnd-20061003-1-src
* fixed bug with not unmapping main menu screen gadgets on other screens
* version number set to 3.2.3
* version 3.2.2 released
---

diff --git a/ChangeLog b/ChangeLog
index 960d5063..668f0616 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,16 @@
+2006-10-03
+	* fixed bug with not unmapping main menu screen gadgets on other screens
+
+2006-08-30
+	* version number set to 3.2.3
+
+2006-08-29
+	* version 3.2.2 released
+
 2006-08-29
 	* fixed bug with redrawing screen in fullscreen mode after quick tape
 	  reloading when using the EMC game engine
+	* changed token names from "last_ce_[1-8]" to "prev_ce_[1-8]"
 
 2006-08-28
 	* fixed bug in GameWon() when level contains no exit (like in Sokoban)
diff --git a/src/Makefile b/src/Makefile
index 7b6345e1..5c273676 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -125,7 +125,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 78c8fc41..6ff19d0f 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2006-08-29 23:29]"
+#define COMPILE_DATE_STRING "[2006-10-03 09:59]"
diff --git a/src/editor.c b/src/editor.c
index 2a7a8e4e..e9168f56 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -6761,7 +6761,11 @@ void DrawLevelEd()
   ReinitializeElementList();		/* update dynamic level element list */
   ReinitializeElementListButtons();	/* custom element may look different */
 
+#if 1
+  UnmapAllGadgets();
+#else
   UnmapTapeButtons();
+#endif
   MapControlButtons();
 
   DrawEditModeWindow();
diff --git a/src/game.c b/src/game.c
index d8eb7353..a6e1449d 100644
--- a/src/game.c
+++ b/src/game.c
@@ -2445,6 +2445,13 @@ void InitGame()
     }
   }
 
+#if 1
+  UnmapAllGadgets();
+
+  MapGameButtons();
+  MapTapeButtons();
+#endif
+
   game.restart_level = FALSE;
 }
 
diff --git a/src/game_em/Makefile b/src/game_em/Makefile
index aec69d09..4fc21cd0 100644
--- a/src/game_em/Makefile
+++ b/src/game_em/Makefile
@@ -1,7 +1,7 @@
 # =============================================================================
 # Rocks'n'Diamonds Makefile (game_em)
 # -----------------------------------------------------------------------------
-# (c) 1995-2005 Holger Schemel <info@artsoft.org>
+# (c) 1995-2006 Holger Schemel <info@artsoft.org>
 # -----------------------------------------------------------------------------
 # Emerald Mine for X11 © 2000,2001 David Tritscher
 # =============================================================================
diff --git a/src/main.h b/src/main.h
index 893d8d8f..a1b5d659 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1727,7 +1727,7 @@
 /* program information and versioning definitions */
 #define PROGRAM_VERSION_MAJOR		3
 #define PROGRAM_VERSION_MINOR		2
-#define PROGRAM_VERSION_PATCH		2
+#define PROGRAM_VERSION_PATCH		3
 #define PROGRAM_VERSION_BUILD		0
 
 #define PROGRAM_TITLE_STRING		"Rocks'n'Diamonds"