X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=fb2e1d3c2682914c2664c597b8ea67adc0fc9388;hb=439b24a7e57f7af4081ef917fabe6b3cb78d902d;hp=cde497414e766ddec9ca5b242e16eb3a295ce843;hpb=6e44f03074b9b879f97c4ce873962649f9699d2e;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index cde49741..fb2e1d3c 100644
--- a/src/files.c
+++ b/src/files.c
@@ -10176,12 +10176,12 @@ boolean SaveLevelChecked(int nr)
   boolean new_level = !fileExists(filename);
   boolean level_saved = FALSE;
 
-  if (new_level || Request("Save this level and kill the old ?", REQ_ASK))
+  if (new_level || Request("Save this level and kill the old?", REQ_ASK))
   {
     SaveLevel(nr);
 
     if (new_level)
-      Request("Level saved !", REQ_CONFIRM);
+      Request("Level saved!", REQ_CONFIRM);
 
     level_saved = TRUE;
   }
@@ -11111,7 +11111,7 @@ void SaveTape(int nr)
   if (fileExists(filename))
   {
     new_tape = FALSE;
-    if (!Request("Replace old tape ?", REQ_ASK))
+    if (!Request("Replace old tape?", REQ_ASK))
       return;
   }
 #endif
@@ -11156,7 +11156,7 @@ void SaveTape(int nr)
 
 #if 0
   if (new_tape)
-    Request("Tape saved !", REQ_CONFIRM);
+    Request("Tape saved!", REQ_CONFIRM);
 #endif
 }
 
@@ -11166,12 +11166,12 @@ boolean SaveTapeChecked(int nr)
   boolean new_tape = !fileExists(filename);
   boolean tape_saved = FALSE;
 
-  if (new_tape || Request("Replace old tape ?", REQ_ASK))
+  if (new_tape || Request("Replace old tape?", REQ_ASK))
   {
     SaveTape(nr);
 
     if (new_tape)
-      Request("Tape saved !", REQ_CONFIRM);
+      Request("Tape saved!", REQ_CONFIRM);
 
     tape_saved = TRUE;
   }
@@ -11346,25 +11346,27 @@ void SaveScore(int nr)
 #define SETUP_TOKEN_TIME_LIMIT			16
 #define SETUP_TOKEN_FULLSCREEN			17
 #define SETUP_TOKEN_FULLSCREEN_MODE		18
-#define SETUP_TOKEN_ASK_ON_ESCAPE		19
-#define SETUP_TOKEN_ASK_ON_ESCAPE_EDITOR	20
-#define SETUP_TOKEN_QUICK_SWITCH		21
-#define SETUP_TOKEN_INPUT_ON_FOCUS		22
-#define SETUP_TOKEN_PREFER_AGA_GRAPHICS		23
-#define SETUP_TOKEN_GAME_FRAME_DELAY		24
-#define SETUP_TOKEN_SP_SHOW_BORDER_ELEMENTS	25
-#define SETUP_TOKEN_SMALL_GAME_GRAPHICS		26
-#define SETUP_TOKEN_GRAPHICS_SET		27
-#define SETUP_TOKEN_SOUNDS_SET			28
-#define SETUP_TOKEN_MUSIC_SET			29
-#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS	30
-#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS	31
-#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC	32
-#define SETUP_TOKEN_VOLUME_SIMPLE		33
-#define SETUP_TOKEN_VOLUME_LOOPS		34
-#define SETUP_TOKEN_VOLUME_MUSIC		35
-
-#define NUM_GLOBAL_SETUP_TOKENS			36
+#define SETUP_TOKEN_WINDOW_SCALING_PERCENT	19
+#define SETUP_TOKEN_WINDOW_SCALING_QUALITY	20
+#define SETUP_TOKEN_ASK_ON_ESCAPE		21
+#define SETUP_TOKEN_ASK_ON_ESCAPE_EDITOR	22
+#define SETUP_TOKEN_QUICK_SWITCH		23
+#define SETUP_TOKEN_INPUT_ON_FOCUS		24
+#define SETUP_TOKEN_PREFER_AGA_GRAPHICS		25
+#define SETUP_TOKEN_GAME_FRAME_DELAY		26
+#define SETUP_TOKEN_SP_SHOW_BORDER_ELEMENTS	27
+#define SETUP_TOKEN_SMALL_GAME_GRAPHICS		28
+#define SETUP_TOKEN_GRAPHICS_SET		29
+#define SETUP_TOKEN_SOUNDS_SET			30
+#define SETUP_TOKEN_MUSIC_SET			31
+#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS	32
+#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS	33
+#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC	34
+#define SETUP_TOKEN_VOLUME_SIMPLE		35
+#define SETUP_TOKEN_VOLUME_LOOPS		36
+#define SETUP_TOKEN_VOLUME_MUSIC		37
+
+#define NUM_GLOBAL_SETUP_TOKENS			38
 
 /* editor setup */
 #define SETUP_TOKEN_EDITOR_EL_BOULDERDASH	0
@@ -11493,6 +11495,8 @@ static struct TokenInfo global_setup_tokens[] =
   { TYPE_SWITCH, &si.time_limit,              "time_limit"		},
   { TYPE_SWITCH, &si.fullscreen,              "fullscreen"		},
   { TYPE_STRING, &si.fullscreen_mode,         "fullscreen_mode"		},
+  { TYPE_INTEGER,&si.window_scaling_percent,  "window_scaling_percent"	},
+  { TYPE_STRING, &si.window_scaling_quality,  "window_scaling_quality"	},
   { TYPE_SWITCH, &si.ask_on_escape,           "ask_on_escape"		},
   { TYPE_SWITCH, &si.ask_on_escape_editor,    "ask_on_escape_editor"	},
   { TYPE_SWITCH, &si.quick_switch,            "quick_player_switch"	},
@@ -11664,6 +11668,8 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->time_limit = TRUE;
   si->fullscreen = FALSE;
   si->fullscreen_mode = getStringCopy(DEFAULT_FULLSCREEN_MODE);
+  si->window_scaling_percent = STD_WINDOW_SCALING_PERCENT;
+  si->window_scaling_quality = getStringCopy(SCALING_QUALITY_DEFAULT);
   si->ask_on_escape = TRUE;
   si->ask_on_escape_editor = TRUE;
   si->quick_switch = FALSE;
@@ -11762,6 +11768,10 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->override_level_sounds = AUTO;
   si->override_level_music = AUTO;
 #endif
+
+#if defined(PLATFORM_ANDROID)
+  si->fullscreen = TRUE;
+#endif
 }
 
 static void setSetupInfoToDefaults_EditorCascade(struct SetupInfo *si)