Oops, two post-tag changes to the config file system.

svn-id: r4306

2 files changed, 46 insertions, 4 deletions

diff --git a/main.cpp b/main.cpp
index 529159f6bd..d0ab26f146 100644
--- a/main.cpp
+++ b/main.cpp
@@ -144,7 +144,15 @@ game settings!
 	/* On Unix, do a quick endian / alignement check before starting */
 	do_memory_test();
 #else
-	scummcfg = new Config(DEFAULT_CONFIG_FILE, "scummvm");
+    char scummhome[255];
+	#if defined (WIN32) && !defined(_WIN32_WCE)
+		GetWindowsDirectory(scummhome, 255);
+		strcat(scummhome, "\\");
+		strcat(scummhome, DEFAULT_CONFIG_FILE);
+	#else	
+		strcpy(scummhome,DEFAULT_CONFIG_FILE);
+	#endif
+	scummcfg = new Config(scummhome, "scummvm");
 #endif
 	scummcfg->set("versioninfo", SCUMMVM_VERSION);
 	if (detector.detectMain(argc, argv))
diff --git a/readme.txt b/readme.txt
index a58ba73e63..58d02de6aa 100644
--- a/readme.txt
+++ b/readme.txt
@@ -202,8 +202,9 @@ and you wish to disable subtitles and run in fullscreen:
   C:\Games\LucasArts\scummvm.exe -f -n -pD:\resource\ ft
 
 Note that if you run the game once this way, and specify the -w commandline
-parameter (or edit scummvm.ini manually), ScummVM will remember the path,
-and other settings for this game.
+parameter (or edit the config file manually), ScummVM will remember the
+path, and other settings for this game. Documentation on the configuration
+file can be found near the end of this readme.
 
 The short game name you see at the end of the command line is very
 important. A short list is contained at the top of this file. You can also
@@ -236,7 +237,7 @@ Command Line Options:
         -a         - Enable amiga pal conversion, for playing Amiga versions
         -d[<num>]  - Set debug verbosity to <num>
         -w[<file>] - Write configuration file
-        -l<file>   - Load alternate configration file (default: scummvm.ini)
+        -l<file>   - Load alternate configration file
 
 In game Hot Keys:
 -----------------
@@ -394,6 +395,39 @@ is kept standard:
 -TMidiChannelAdl -TGui -TScumm -TSoundEngine -TPart -TPlayer
 
 
+Configuration file:
+-------------------
+By default, the configuration file is saved in, and loaded from:
+
+        Windows: <windir>\scummvm.ini,
+        Linux:   ~/.scummvmrc
+        Others:  scummvm.ini in the current directory
+
+An example config file is as follows:
+
+        [scummvm]
+        gfx_mode=supereagle
+        fullscreen=true
+
+        [tentacle]
+        path=C:\tentacle\
+        nosubtitles=true
+        master_volume=98
+        music_volume=40
+        sfx_volume=255
+
+        [loomcd]
+        cdrom=1
+        path=C:\loom\
+        talkspeed=55
+        
+        [monkey2]
+        path=C:\amiga_mi2\
+        music_driver=windows
+        amiga=true
+
+
+
 Credits:
 --------
   The core ScummVM team: