From: Holger Schemel <info@artsoft.org>
Date: Sat, 4 Jan 2014 21:57:10 +0000 (+0100)
Subject: rnd-20140104-4-src
X-Git-Tag: 4.0.0.0-rc1~417
X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=cf0ff8143f99393006fc7ebdafd9616becf0ccc6

rnd-20140104-4-src
---

diff --git a/src/conftime.h b/src/conftime.h
index 6b263102..8ccd1865 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "2014-01-04 22:06"
+#define COMPILE_DATE_STRING "2014-01-04 22:53"
diff --git a/src/libgame/sdl.h b/src/libgame/sdl.h
index e86253e3..5652613a 100644
--- a/src/libgame/sdl.h
+++ b/src/libgame/sdl.h
@@ -47,10 +47,16 @@
 #define TARGET_STRING		"SDL"
 #endif
 
+#if defined(PLATFORM_ANDROID)
+#define WINDOW_SCALING_STATUS	WINDOW_SCALING_NOT_AVAILABLE
+#define FULLSCREEN_STATUS	FULLSCREEN_NOT_AVAILABLE
+#elif defined(TARGET_SDL2)
+#define WINDOW_SCALING_STATUS	WINDOW_SCALING_AVAILABLE
 #define FULLSCREEN_STATUS	FULLSCREEN_AVAILABLE
-
-#if defined(TARGET_SDL2)
 #define USE_DESKTOP_FULLSCREEN	TRUE
+#else	// SDL 1.2
+#define WINDOW_SCALING_STATUS	WINDOW_SCALING_NOT_AVAILABLE
+#define FULLSCREEN_STATUS	FULLSCREEN_AVAILABLE
 #endif
 
 #define CURSOR_MAX_WIDTH	32
diff --git a/src/libgame/system.c b/src/libgame/system.c
index 0c750452..39c78b3f 100644
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -449,7 +449,7 @@ void InitVideoBuffer(int width, int height, int depth, boolean fullscreen)
   video.fullscreen_modes = NULL;
 #endif
 
-  video.window_scaling_available = TRUE;
+  video.window_scaling_available = WINDOW_SCALING_STATUS;
 
 #if defined(TARGET_SDL)
   SDLInitVideoBuffer(&backbuffer, &window, fullscreen);
diff --git a/src/libgame/system.h b/src/libgame/system.h
index 68a56cdd..b9f65d14 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -47,9 +47,18 @@
 #define BLIT_INVERSE			2
 #define BLIT_ON_BACKGROUND		3
 
+/* values for fullscreen status */
 #define FULLSCREEN_NOT_AVAILABLE	FALSE
 #define FULLSCREEN_AVAILABLE		TRUE
 
+/* values for window scaling */
+#define WINDOW_SCALING_NOT_AVAILABLE	FALSE
+#define WINDOW_SCALING_AVAILABLE	TRUE
+
+#define MIN_WINDOW_SCALING_PERCENT	10
+#define STD_WINDOW_SCALING_PERCENT	100
+#define MAX_WINDOW_SCALING_PERCENT	300
+
 /* default input keys */
 #define DEFAULT_KEY_LEFT		KSYM_Left
 #define DEFAULT_KEY_RIGHT		KSYM_Right
@@ -644,11 +653,6 @@
     gfx.draw_busy_anim_function();		\
 }
 
-/* values for window scaling */
-#define MIN_WINDOW_SCALING_PERCENT	10
-#define STD_WINDOW_SCALING_PERCENT	100
-#define MAX_WINDOW_SCALING_PERCENT	300
-
 
 /* type definitions */
 #if defined(TARGET_SDL2)
diff --git a/src/libgame/x11.h b/src/libgame/x11.h
index 9f2efee8..dc22d353 100644
--- a/src/libgame/x11.h
+++ b/src/libgame/x11.h
@@ -43,6 +43,7 @@
 #define TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND
 #endif
 
+#define WINDOW_SCALING_STATUS	WINDOW_SCALING_NOT_AVAILABLE
 #define FULLSCREEN_STATUS	FULLSCREEN_NOT_AVAILABLE
 
 #define CURSOR_MAX_WIDTH	32
diff --git a/src/screens.c b/src/screens.c
index fe3b75ea..720f1574 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -4161,8 +4161,8 @@ static void execSetupEditor()
 
 static void execSetupGraphics()
 {
-
-  if (video.fullscreen_available && screen_modes == NULL)
+  // if (screen_modes == NULL && video.fullscreen_available)
+  if (screen_modes == NULL && video.fullscreen_modes != NULL)
   {
     int i;
 
@@ -4210,7 +4210,8 @@ static void execSetupGraphics()
       video.fullscreen_available = FALSE;
   }
 
-  if (video.fullscreen_available)
+  // if (video.fullscreen_available)
+  if (screen_mode_current != NULL)
   {
     setup.fullscreen_mode = screen_mode_current->identifier;