X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ffiles.c;h=edc1358edc4386ce944e6f6f3ecd84fbbf4cb9c1;hp=e5ca6168c5a3c5e4612d2460fad557ae3f0ce5a7;hb=61a2ef633881ce5e865c8747f6393700c870f675;hpb=bb0b4d6b538a625aaa98a25190891ef1fb766168

diff --git a/src/files.c b/src/files.c
index e5ca6168..edc1358e 100644
--- a/src/files.c
+++ b/src/files.c
@@ -7911,29 +7911,30 @@ void SaveScore(int nr)
 #define SETUP_TOKEN_FULLSCREEN			17
 #define SETUP_TOKEN_WINDOW_SCALING_PERCENT	18
 #define SETUP_TOKEN_WINDOW_SCALING_QUALITY	19
-#define SETUP_TOKEN_ASK_ON_ESCAPE		20
-#define SETUP_TOKEN_ASK_ON_ESCAPE_EDITOR	21
-#define SETUP_TOKEN_QUICK_SWITCH		22
-#define SETUP_TOKEN_INPUT_ON_FOCUS		23
-#define SETUP_TOKEN_PREFER_AGA_GRAPHICS		24
-#define SETUP_TOKEN_GAME_FRAME_DELAY		25
-#define SETUP_TOKEN_SP_SHOW_BORDER_ELEMENTS	26
-#define SETUP_TOKEN_SMALL_GAME_GRAPHICS		27
-#define SETUP_TOKEN_SHOW_SNAPSHOT_BUTTONS	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 SETUP_TOKEN_TOUCH_CONTROL_TYPE		38
-#define SETUP_TOKEN_TOUCH_MOVE_DISTANCE		39
-#define SETUP_TOKEN_TOUCH_DROP_DISTANCE		40
-
-#define NUM_GLOBAL_SETUP_TOKENS			41
+#define SETUP_TOKEN_SCREEN_RENDERING_MODE	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_SHOW_SNAPSHOT_BUTTONS	29
+#define SETUP_TOKEN_GRAPHICS_SET		30
+#define SETUP_TOKEN_SOUNDS_SET			31
+#define SETUP_TOKEN_MUSIC_SET			32
+#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS	33
+#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS	34
+#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC	35
+#define SETUP_TOKEN_VOLUME_SIMPLE		36
+#define SETUP_TOKEN_VOLUME_LOOPS		37
+#define SETUP_TOKEN_VOLUME_MUSIC		38
+#define SETUP_TOKEN_TOUCH_CONTROL_TYPE		39
+#define SETUP_TOKEN_TOUCH_MOVE_DISTANCE		40
+#define SETUP_TOKEN_TOUCH_DROP_DISTANCE		41
+
+#define NUM_GLOBAL_SETUP_TOKENS			42
 
 /* editor setup */
 #define SETUP_TOKEN_EDITOR_EL_BOULDERDASH	0
@@ -8085,6 +8086,7 @@ static struct TokenInfo global_setup_tokens[] =
   { TYPE_SWITCH, &si.fullscreen,              "fullscreen"		},
   { TYPE_INTEGER,&si.window_scaling_percent,  "window_scaling_percent"	},
   { TYPE_STRING, &si.window_scaling_quality,  "window_scaling_quality"	},
+  { TYPE_STRING, &si.screen_rendering_mode,   "screen_rendering_mode"	},
   { 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"	},
@@ -8266,6 +8268,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->fullscreen = FALSE;
   si->window_scaling_percent = STD_WINDOW_SCALING_PERCENT;
   si->window_scaling_quality = getStringCopy(SCALING_QUALITY_DEFAULT);
+  si->screen_rendering_mode = getStringCopy(STR_SPECIAL_RENDERING_DEFAULT);
   si->ask_on_escape = TRUE;
   si->ask_on_escape_editor = TRUE;
   si->quick_switch = FALSE;
@@ -8761,6 +8764,31 @@ static void InitMenuDesignSettings_SpecialPreProcessing()
 
   /* special case: initialize "ARG_DEFAULT" values in static default config */
   /* (e.g., initialize "[titlemessage].fade_mode" from "[title].fade_mode") */
+  titlescreen_initial_first_default.fade_mode  =
+    title_initial_first_default.fade_mode;
+  titlescreen_initial_first_default.fade_delay =
+    title_initial_first_default.fade_delay;
+  titlescreen_initial_first_default.post_delay =
+    title_initial_first_default.post_delay;
+  titlescreen_initial_first_default.auto_delay =
+    title_initial_first_default.auto_delay;
+  titlescreen_first_default.fade_mode  = title_first_default.fade_mode;
+  titlescreen_first_default.fade_delay = title_first_default.fade_delay;
+  titlescreen_first_default.post_delay = title_first_default.post_delay;
+  titlescreen_first_default.auto_delay = title_first_default.auto_delay;
+  titlemessage_initial_first_default.fade_mode  =
+    title_initial_first_default.fade_mode;
+  titlemessage_initial_first_default.fade_delay =
+    title_initial_first_default.fade_delay;
+  titlemessage_initial_first_default.post_delay =
+    title_initial_first_default.post_delay;
+  titlemessage_initial_first_default.auto_delay =
+    title_initial_first_default.auto_delay;
+  titlemessage_first_default.fade_mode  = title_first_default.fade_mode;
+  titlemessage_first_default.fade_delay = title_first_default.fade_delay;
+  titlemessage_first_default.post_delay = title_first_default.post_delay;
+  titlemessage_first_default.auto_delay = title_first_default.auto_delay;
+
   titlescreen_initial_default.fade_mode  = title_initial_default.fade_mode;
   titlescreen_initial_default.fade_delay = title_initial_default.fade_delay;
   titlescreen_initial_default.post_delay = title_initial_default.post_delay;
@@ -8782,6 +8810,11 @@ static void InitMenuDesignSettings_SpecialPreProcessing()
   /* (e.g., init "titlemessage_1.fade_mode" from "[titlemessage].fade_mode") */
   for (i = 0; i < MAX_NUM_TITLE_MESSAGES; i++)
   {
+    titlescreen_initial_first[i] = titlescreen_initial_first_default;
+    titlescreen_first[i] = titlescreen_first_default;
+    titlemessage_initial_first[i] = titlemessage_initial_first_default;
+    titlemessage_first[i] = titlemessage_first_default;
+
     titlescreen_initial[i] = titlescreen_initial_default;
     titlescreen[i] = titlescreen_default;
     titlemessage_initial[i] = titlemessage_initial_default;
@@ -8891,6 +8924,10 @@ static void LoadMenuDesignSettingsFromFilename(char *filename)
   }
   title_info[] =
   {
+    /* initialize first titles from "enter screen" definitions, if defined */
+    { &title_initial_first_default,	"menu.enter_screen.TITLE"	},
+    { &title_first_default,		"menu.enter_screen.TITLE"	},
+
     /* initialize title screens from "next screen" definitions, if defined */
     { &title_initial_default,		"menu.next_screen.TITLE"	},
     { &title_default,			"menu.next_screen.TITLE"	},