Renamed 'options' as 'options.txt' on systems where former name was used.

Loading falls back to using old file if the new one does not exist.
Saving always happens to the new filename.


git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/trunk@671 0420edf4-82e4-42fc-9478-35b55e6d67a3

data/translations/fi_FI.lst

@@ -47,7 +47,7 @@
 *[idx] 40 [engl] Race Over [trans] Kisa ohi
 
 *[idx] 41 [engl] For more configuration options, please edit the [trans] Muita asetuksia voit muuttaa
-*[idx] 42 [engl] file 'options' and read the documentation. [trans] tiedostosta 'options'
+*[idx] 42 [engl] file 'options.txt' and read the documentation. [trans] tiedostosta 'options.txt'
 *[idx] 43 [engl] Help [trans] Apua
 *[idx] 44 [engl] 1, 2, 3 - change view mode [trans] 1, 2, 3 - Vaihda kuvakulmaa
 *[idx] 45 [engl] F - hide/show fps display [trans] F - Näytä/kätke ruudun päivitysnopeuden näyttö

data/translations/xx_XX.lst

@@ -47,7 +47,7 @@
 *[idx] 40 [engl] Race Over [trans]
 
 *[idx] 41 [engl] For more configuration options, please edit the [trans]
-*[idx] 42 [engl] file 'options' and read the documentation. [trans]
+*[idx] 42 [engl] file 'options.txt' and read the documentation. [trans]
 *[idx] 43 [engl] Help [trans]
 *[idx] 44 [engl] 1, 2, 3 - change view mode [trans]
 *[idx] 45 [engl] F - hide/show fps display [trans]

src/game_config.cpp

@@ -26,11 +26,11 @@ Then edit the below functions:
 	The first value is always 'line', the second defines the tag within the
 	brackets [ ], and the last value is the default.
 
-- SetConfigDefaults. These values are used as long as no options file exists.
+- SetConfigDefaults. These values are used as long as no options.txt or options file exists.
 	It's a good idea to use the same values as the defaults in LoadConfigFile.
 
 - SaveConfigFile. See the other entries; it should be self-explanatory.
-	If an options file exists, you will have to change any value at runtime
+	If an options.txt or options file exists, you will have to change any value at runtime
 	on the configuration screen to overwrite the file. Then you will see the
 	new entry.
 */
@@ -51,7 +51,7 @@ TParam param;
 void LoadConfigFile() {
 	CSPList list;
 	if (!list.Load(param.configfile)) {
-		Message("Could not load 'options'");
+		Message("Could not load 'options.txt'");
 		return;
 	}
 
@@ -258,18 +258,23 @@ void SaveConfigFile() {
 	liste.Add();
 
 	// ---------------------------------------
-	liste.Save(param.configfile);
+	liste.Save(param.config_dir + SEP "options.txt");
 }
 
 // --------------------------------------------------------------------
 
 void InitConfig() {
+	int config_exist = 0;
+
 #if defined (OS_WIN32_MINGW) || defined (OS_WIN32_MSC)
 	// the progdir is always the current dir
 	param.config_dir = "config";
 	param.data_dir = "data";
 	param.save_dir = "data";
 	param.configfile = param.config_dir + SEP "options.txt";
+	if (FileExists(param.configfile)) {
+		config_exist = 1;
+	}
 #else /* WIN32 */
 
 #if 0
@@ -302,7 +307,16 @@ void InitConfig() {
 	param.data_dir += SEP;
 	param.data_dir += "etr";
 	param.save_dir = param.config_dir;
-	param.configfile = param.config_dir + SEP "options";
+	param.configfile = param.config_dir + SEP "options.txt";
+	if (FileExists(param.configfile)) {
+		config_exist = 1;
+	} else {
+		// Old name as fallback
+		param.configfile = param.config_dir + SEP "options";
+		if (FileExists(param.configfile)) {
+			config_exist = 2;
+		}
+	}
 #endif /* WIN32 */
 
 	param.screenshot_dir = param.save_dir + SEP "screenshots";
@@ -323,7 +337,7 @@ void InitConfig() {
 	param.display_fps = false;
 	param.show_hud = true;
 
-	if (FileExists(param.configfile)) {
+	if (config_exist > 0) {
 		Trans.LoadLanguages();
 		LoadConfigFile();
 	} else {

src/translation.cpp

@@ -72,7 +72,7 @@ void CTranslation::SetDefaultTranslations() {
 	texts[40] = "Race Over";
 
 	texts[41] = "For more configuration options, please edit the";
-	texts[42] = "file 'options' and read the documentation.";
+	texts[42] = "file 'options.txt' and read the documentation.";
 
 	texts[43] = "Help";
 	texts[44] = "1, 2, 3 - change view mode";