From 1ceb7ce8723b32b267758bfda3bb7903fff8ea7a Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Mon, 15 Jun 2009 22:47:54 +0200 Subject: [PATCH] rocksndiamonds-3.2.6.1 * version 3.2.6.1 released --- ChangeLog | 8 ++++++++ src/Makefile | 2 +- src/conftime.h | 2 +- src/game_em/Makefile | 2 +- src/libgame/system.c | 8 +++++++- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50a9bbac..41f88faf 100644 --- 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 365c417c..bd5538ea 100644 --- 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 3cefa770..e3b6bfc9 100644 --- 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 4fc21cd0..aec69d09 100644 --- 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 +# (c) 1995-2005 Holger Schemel # ----------------------------------------------------------------------------- # Emerald Mine for X11 © 2000,2001 David Tritscher # ============================================================================= diff --git a/src/libgame/system.c b/src/libgame/system.c index c3d95754..d4b7f9a9 100644 --- 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, -- 2.34.1