X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=d428ae99ef19ae1b39c96a97c0eea46a41395089;hb=ec5b593331609b38b793231e43b0bf57ce309eb2;hp=d1b60e47c704ccbaa6119f38035134a0c16404b9;hpb=064971ae82e2e3f98dc55e75b15c192c9165fb4e;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index d1b60e47..d428ae99 100644
--- a/src/files.c
+++ b/src/files.c
@@ -8044,8 +8044,10 @@ void SaveScore(int nr)
 #define SETUP_TOKEN_INT_FALLBACK_MUSIC_FILE	12
 #define SETUP_TOKEN_INT_DEFAULT_LEVEL_SERIES	13
 #define SETUP_TOKEN_INT_CHOOSE_FROM_TOP_LEVELDIR 14
+#define SETUP_TOKEN_INT_DEFAULT_WINDOW_WIDTH	15
+#define SETUP_TOKEN_INT_DEFAULT_WINDOW_HEIGHT	16
 
-#define NUM_INTERNAL_SETUP_TOKENS		15
+#define NUM_INTERNAL_SETUP_TOKENS		17
 
 /* options setup */
 #define SETUP_TOKEN_OPTIONS_VERBOSE		0
@@ -8217,6 +8219,8 @@ static struct TokenInfo internal_setup_tokens[] =
   { TYPE_STRING, &sxi.fallback_music_file,	"fallback_music_file"	},
   { TYPE_STRING, &sxi.default_level_series,	"default_level_series"	},
   { TYPE_BOOLEAN,&sxi.choose_from_top_leveldir,	"choose_from_top_leveldir" },
+  { TYPE_INTEGER,&sxi.default_window_width,	"default_window_width"	},
+  { TYPE_INTEGER,&sxi.default_window_height,	"default_window_height"	},
 };
 
 static struct TokenInfo options_setup_tokens[] =
@@ -8379,6 +8383,9 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->internal.default_level_series = getStringCopy(UNDEFINED_LEVELSET);
   si->internal.choose_from_top_leveldir = FALSE;
 
+  si->internal.default_window_width  = WIN_XSIZE_DEFAULT;
+  si->internal.default_window_height = WIN_YSIZE_DEFAULT;
+
   si->options.verbose = FALSE;
 
 #if defined(PLATFORM_ANDROID)
@@ -8757,6 +8764,14 @@ 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_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;
+  titlescreen_initial_default.auto_delay = title_initial_default.auto_delay;
+  titlescreen_default.fade_mode  = title_default.fade_mode;
+  titlescreen_default.fade_delay = title_default.fade_delay;
+  titlescreen_default.post_delay = title_default.post_delay;
+  titlescreen_default.auto_delay = title_default.auto_delay;
   titlemessage_initial_default.fade_mode  = title_initial_default.fade_mode;
   titlemessage_initial_default.fade_delay = title_initial_default.fade_delay;
   titlemessage_initial_default.post_delay = title_initial_default.post_delay;
@@ -8770,6 +8785,8 @@ 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[i] = titlescreen_initial_default;
+    titlescreen[i] = titlescreen_default;
     titlemessage_initial[i] = titlemessage_initial_default;
     titlemessage[i] = titlemessage_default;
   }
@@ -8890,15 +8907,37 @@ static void LoadMenuDesignSettingsFromFilename(char *filename)
   }
   titlemessage_arrays[] =
   {
-    /* initialize title messages from "next screen" definitions, if defined */
+    /* initialize first titles from "enter screen" definitions, if defined */
+    { titlescreen_initial_first,	"menu.enter_screen.TITLE"	},
+    { titlescreen_first,		"menu.enter_screen.TITLE"	},
+    { titlemessage_initial_first,	"menu.enter_screen.TITLE"	},
+    { titlemessage_first,		"menu.enter_screen.TITLE"	},
+
+    /* initialize titles from "next screen" definitions, if defined */
+    { titlescreen_initial,		"menu.next_screen.TITLE"	},
+    { titlescreen,			"menu.next_screen.TITLE"	},
     { titlemessage_initial,		"menu.next_screen.TITLE"	},
     { titlemessage,			"menu.next_screen.TITLE"	},
 
-    /* overwrite title messages with title definitions, if defined */
+    /* overwrite titles with title definitions, if defined */
+    { titlescreen_initial_first,	"[title_initial]"		},
+    { titlescreen_first,		"[title]"			},
+    { titlemessage_initial_first,	"[title_initial]"		},
+    { titlemessage_first,		"[title]"			},
+
+    { titlescreen_initial,		"[title_initial]"		},
+    { titlescreen,			"[title]"			},
     { titlemessage_initial,		"[title_initial]"		},
     { titlemessage,			"[title]"			},
 
-    /* overwrite title messages with title message definitions, if defined */
+    /* overwrite titles with title screen/message definitions, if defined */
+    { titlescreen_initial_first,	"[titlescreen_initial]"		},
+    { titlescreen_first,		"[titlescreen]"			},
+    { titlemessage_initial_first,	"[titlemessage_initial]"	},
+    { titlemessage_first,		"[titlemessage]"		},
+
+    { titlescreen_initial,		"[titlescreen_initial]"		},
+    { titlescreen,			"[titlescreen]"			},
     { titlemessage_initial,		"[titlemessage_initial]"	},
     { titlemessage,			"[titlemessage]"		},
 
@@ -9112,7 +9151,7 @@ static void LoadMenuDesignSettingsFromFilename(char *filename)
 
 	tfi = *info;
 
-	*(boolean *)title_tokens[j].value = (boolean)parameter_value;
+	*(int *)title_tokens[j].value = (int)parameter_value;
 
 	*info = tfi;
       }
@@ -9142,9 +9181,9 @@ static void LoadMenuDesignSettingsFromFilename(char *filename)
 	  tmi = array[k];
 
 	  if (titlemessage_tokens[j].type == TYPE_INTEGER)
-	    *(boolean *)titlemessage_tokens[j].value = (boolean)parameter_value;
-	  else
 	    *(int     *)titlemessage_tokens[j].value = (int)parameter_value;
+	  else
+	    *(boolean *)titlemessage_tokens[j].value = (boolean)parameter_value;
 
 	  array[k] = tmi;
 	}