rocksndiamonds-3.2.6.1

* version 3.2.6.1 released

diff --git a/ChangeLog b/ChangeLog
index 50a9bbac783f314fc1367f811639da3683e5384d..41f88faf0dd22234d59f47d5786559301f09af8d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-06-15
+       * version 3.2.6.1 released
+
 2009-05-31
        * fixed bug with element_info[e].gfx_element not being initialized in
          early game stage, causing native graphics in EMC level sets to be
@@ -5,6 +8,11 @@
          (this only happened when starting the program with an EMC set with
          native graphics, but not when switching to such a set at runtime)
 
+2009-03-30
+       * deactivated blit-to-same-surface workaround again (see 2009-03-24)
+         and using self-compiled, patched SDL.dll that solves this problem
+         (interim solution until release of SDL 1.2.14 that should fix this)
+
 2009-03-26
        * extended backwards compatibility mode to allow already fixed bug with
          change actions (see "2008-02-05") for existing levels (especially the

diff --git a/src/Makefile b/src/Makefile
index 365c417c9559aa538309bfad0422368697c2a363..bd5538eae7cb19bdd3894e5c8fdf911a1d3f589e 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -144,7 +144,7 @@ CONFIG_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR)
 CONFIG_GAME = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(CONFIG_SPECIAL)
 
 CONFIG = $(CONFIG_GAME) $(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 3cefa770e5c42f416135f6c2ec7b6eaed6046d46..e3b6bfc91f60b860a302f5b0a28817ac1e4121da 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "2009-05-31 03:01"
+#define COMPILE_DATE_STRING "2009-06-15 22:46"

diff --git a/src/game_em/Makefile b/src/game_em/Makefile
index 4fc21cd0f12f70d64b654b99203430597c36e5e0..aec69d091a181b622e9c068441192bc77a5534d9 100644 (file)
--- a/src/game_em/Makefile
+++ b/src/game_em/Makefile
@@ -1,7 +1,7 @@
 # =============================================================================
 # Rocks'n'Diamonds Makefile (game_em)
 # -----------------------------------------------------------------------------
-# (c) 1995-2006 Holger Schemel <info@artsoft.org>
+# (c) 1995-2005 Holger Schemel <info@artsoft.org>
 # -----------------------------------------------------------------------------
 # Emerald Mine for X11 © 2000,2001 David Tritscher
 # =============================================================================

diff --git a/src/libgame/system.c b/src/libgame/system.c
index c3d9575489c60fb74c5bb67c6fd8a926b2341268..d4b7f9a92b7b5147f38f93eca7ad7e028bb6b7f8 100644 (file)
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -499,7 +499,12 @@ void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap,
     return;
 
 #if 0
-  /* !!! 2009-03-24: It seems that this problem still exists with 1.2.12 !!! */
+  /* !!! 2009-03-30: Fixed by using self-compiled, patched SDL.dll !!! */
+  /* (This bug still exists in the actual (as of 2009-06-15) version 1.2.13,
+     but is already fixed in SVN and should therefore finally be fixed with
+     the next official SDL release, which is probably version 1.2.14.) */
+#if 1
+  /* !!! 2009-03-24: It seems that this problem still exists in 1.2.12 !!! */
 #if defined(TARGET_SDL) && defined(PLATFORM_WIN32)
   if (src_bitmap == dst_bitmap)
   {
@@ -543,6 +548,7 @@ void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap,
     return;
   }
 #endif
+#endif
 #endif
 
   sysCopyArea(src_bitmap, dst_bitmap,