rnd-20140104-4-src

diff --git a/src/conftime.h b/src/conftime.h
index 6b26310270f42ec036f84f2689889daa0d0dbd9b..8ccd1865b1a4d2b6020eaf89a276072af5377369 100644 (file)
--- 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 e86253e349b8ea4593cd6a3b87eda85a079c28cf..5652613ac59915a6d32e848bb17a3800e8db9307 100644 (file)
--- a/src/libgame/sdl.h
+++ b/src/libgame/sdl.h
@@ -47,10 +47,16 @@
 #define TARGET_STRING          "SDL"
 #endif
 
 #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
 #define FULLSCREEN_STATUS      FULLSCREEN_AVAILABLE

-
-#if defined(TARGET_SDL2)

 #define USE_DESKTOP_FULLSCREEN TRUE
 #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
 #endif
 
 #define CURSOR_MAX_WIDTH       32

diff --git a/src/libgame/system.c b/src/libgame/system.c
index 0c75045275d224924c40bdf96eff2949b6f2c3b5..39c78b3fef57230c58ae320f6632572ff1f1d64c 100644 (file)
--- 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.fullscreen_modes = NULL;
 #endif
 

-  video.window_scaling_available = TRUE;
+  video.window_scaling_available = WINDOW_SCALING_STATUS;

 
 #if defined(TARGET_SDL)
   SDLInitVideoBuffer(&backbuffer, &window, fullscreen);
 
 #if defined(TARGET_SDL)
   SDLInitVideoBuffer(&backbuffer, &window, fullscreen);

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 68a56cddcf611009da002240c1601e145a2a19b6..b9f65d149e19f77bffcc2b2aefc5ccc982ec461d 100644 (file)
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -47,9 +47,18 @@
 #define BLIT_INVERSE                   2
 #define BLIT_ON_BACKGROUND             3
 
 #define BLIT_INVERSE                   2
 #define BLIT_ON_BACKGROUND             3
 

+/* values for fullscreen status */

 #define FULLSCREEN_NOT_AVAILABLE       FALSE
 #define FULLSCREEN_AVAILABLE           TRUE
 
 #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
 /* default input keys */
 #define DEFAULT_KEY_LEFT               KSYM_Left
 #define DEFAULT_KEY_RIGHT              KSYM_Right


@@ -644,11 +653,6 @@
     gfx.draw_busy_anim_function();             \
 }
 
     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)
 
 /* type definitions */
 #if defined(TARGET_SDL2)

diff --git a/src/libgame/x11.h b/src/libgame/x11.h
index 9f2efee8b44470fe7a03fc8c5c23a869a5372ac2..dc22d353d50af81e00266b27375034dd7399b0a0 100644 (file)
--- a/src/libgame/x11.h
+++ b/src/libgame/x11.h
@@ -43,6 +43,7 @@
 #define TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND
 #endif
 
 #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
 #define FULLSCREEN_STATUS      FULLSCREEN_NOT_AVAILABLE
 
 #define CURSOR_MAX_WIDTH       32

diff --git a/src/screens.c b/src/screens.c
index fe3b75ea65a03251a9f55a5d2537211242667356..720f1574cdff405c282f75dcb4cdd11bba647f89 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -4161,8 +4161,8 @@ static void execSetupEditor()
 
 static void execSetupGraphics()
 {
 
 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;
 
   {
     int i;
 


@@ -4210,7 +4210,8 @@ static void execSetupGraphics()
       video.fullscreen_available = FALSE;
   }
 
       video.fullscreen_available = FALSE;
   }
 

-  if (video.fullscreen_available)
+  // if (video.fullscreen_available)
+  if (screen_mode_current != NULL)

   {
     setup.fullscreen_mode = screen_mode_current->identifier;
 
   {
     setup.fullscreen_mode = screen_mode_current->identifier;