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 960d506361e8c330e1af171874e3afa93cfce053..668f0616c3872311be8ba64ce8098f8ee1dae02d 100644 (file)
--- 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 7b6345e1a61c7a2631f3fc8fb1bd0dbff47cf1db..5c273676726ba290a4a7cf5743181bbec63ff967 100644 (file)
--- 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 78c8fc411564b97ba2eacfd57b8e218c06c9ed2f..6ff19d0f27b8b633329061fcb932444fe6690ab8 100644 (file)
--- 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 2a7a8e4e19e7662046cb069eedf580093b3a8d4e..e9168f566086b132493234ae311442f30924b895 100644 (file)
--- 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 d8eb7353a2f2b6b507c949c23c2751ec6bb03ee6..a6e1449d700868daf5494ad911fe74cca9cdd6ba 100644 (file)
--- 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 aec69d091a181b622e9c068441192bc77a5534d9..4fc21cd0f12f70d64b654b99203430597c36e5e0 100644 (file)
--- 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 893d8d8f373417879798566f95314bee7709a849..a1b5d65976f79df30e5aeb9908d5150365af8c98 100644 (file)
--- 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"