X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=988a97fae17f47e8b2d44deafc2a1f68e7d58836;hb=7ecf99096c7c23909ada034e05d971464f66552f;hp=e3f5847d4ba45a2469318668e59b4dcaa8eee0d3;hpb=3ae70b9d27b4b2c038f35b0aa5985c368542a486;p=rocksndiamonds.git

diff --git a/src/libgame/system.c b/src/libgame/system.c
index e3f5847d..988a97fa 100644
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -129,6 +129,9 @@ void InitExitFunction(void (*exit_function)(int))
 
 void InitPlatformDependentStuff(void)
 {
+  // this is initialized in GetOptions(), but may already be used before
+  options.verbose = TRUE;
+
 #if defined(PLATFORM_MSDOS)
   _fmode = O_BINARY;
 #endif
@@ -703,14 +706,17 @@ void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap,
     height = dst_bitmap->height - dst_y;
 #endif
 
-#if 0
+#if 1
+  /* !!! 2013-12-11: An "old friend" is back. Same bug in SDL2 2.0.1 !!! */
+#if 1
   /* !!! 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 defined(TARGET_SDL) && defined(PLATFORM_WIN32)
+#if defined(TARGET_SDL2)
   if (src_bitmap == dst_bitmap)
   {
     /* !!! THIS IS A BUG (IN THE SDL LIBRARY?) AND SHOULD BE FIXED !!! */
@@ -755,6 +761,7 @@ void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap,
 #endif
 #endif
 #endif
+#endif
 
 #if 0
   if (dst_x < gfx.sx + gfx.sxsize)