Add new platforms.

Sync. more changes.

svn-id: r20126

6 files changed, 44 insertions, 24 deletions

diff --git a/README b/README
index f8a68b6b15..b5f3e2d6f0 100644
--- a/README
+++ b/README
@@ -478,8 +478,9 @@ arguments -- see the next section.
                            drive)
   --joystick[=NUM]         Enable input with joystick (default: 0 = first
                            joystick)
-  --platform=WORD          Specify version of game (allowed values: amiga,
-                           atari, c64, fmtowns, mac, nes, pc, windows)
+  --platform=WORD          Specify version of game (allowed values: acorn,
+                           amiga, atari, c64, fmtowns, mac, nes, pc, segacd,
+                           windows)
   --savepath=PATH          Path to where savegames are stored
   --soundfont=FILE         Select the SoundFont for MIDI playback (Only
                            supported by some MIDI drivers)
@@ -488,7 +489,7 @@ arguments -- see the next section.
   --enable-gs              Enable Roland GS mode for MIDI playback
   --output-rate=RATE       Select output sample rate in Hz (e.g. 22050)
   --aspect-ratio           Enable aspect ratio correction
-  --render-mode=MODE       Enable additional render modes (cga, ega, hercGreen
+  --render-mode=MODE       Enable additional render modes (cga, ega, hercGreen,
                            hercAmber, amiga)
   --force-1x-overlay       Make inner GUI 320x200
 
@@ -625,7 +626,7 @@ hence for this game scalers will scale to 640x480 or 960x720.
 5.4) Hot Keys:
 ---- ---------
 ScummVM supports various in game hotkeys. They differ between the SCUMM and
-simon games.
+other games.
 
     Common:
         Cmd-q                  - Quit (Mac OS X)
@@ -662,6 +663,7 @@ simon games.
 
     Beneath a Steel Sky:
         Ctrl 0-9 and Alt 0-9   - Load and save game state
+        Ctrl-d                 - Starts the debugger
         Ctrl-g                 - Runs in really REALLY fast mode
         F5                     - Displays a save/load box
         Escape                 - Skips the game intro
@@ -683,6 +685,10 @@ simon games.
         Escape                 - Skips cutscenes
         Space                  - Skips current line of text
 
+    The Legend of Kyrandia:
+        Ctrl 0-9 and Alt 0-9   - Load and save game state
+        Ctrl-d                 - Starts the debugger
+
     Simon the Sorcerer 1 & 2:
         Ctrl 0-9 and Alt 0-9   - Load and save game state
         Ctrl-d                 - Starts the debugger
@@ -693,17 +699,12 @@ simon games.
         m                      - Music on/off
         s                      - Sound effects on/off
         b                      - Background sounds on/off
-        p                      - Toggles pause
+        p                      - Pauses
         t                      - Switch between speech and subtitles
         v                      - Switch between subtitles only and
                                  combined speech & subtitles
                                  [Simon the Sorcerer 2 only]
 
-    The Legend of Kyrandia:
-        Ctrl 0-9 and Alt 0-9   - Load and save game state
-        d                      - Starts the debugger
-        q                      - Exits the game
-
 Note that using ctrl-f and ctrl-g are not recommended: games can crash when
 being run faster than their normal speed, as scripts will lose synchronisation.
 
@@ -1167,7 +1168,7 @@ sample rate.
 
 When using the Adlib, FM Towns, PC Speaker or IBM PCjr music drivers, ScummVM
 is responsible for generating the samples. Usually 22050 Hz will be plenty for
-these, but there is at least one piece of Adlib music in Beneath a Steeel Sky
+these, but there is at least one piece of Adlib music in Beneath a Steel Sky
 that will sound a lot better at 44100 Hz.
 
 Using frequencies in between is not recommended. For one thing, your sound card
@@ -1222,7 +1223,6 @@ An example config file looks as follows:
         [monkey2]
         path=C:\amiga_mi2\
         music_driver=windows
-        amiga=true
 
 The following keywords are recognized:
 
diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp
index 567baca03e..91d13e2b38 100644
--- a/base/gameDetector.cpp
+++ b/base/gameDetector.cpp
@@ -85,8 +85,9 @@ static const char USAGE_STRING[] =
 	"                           drive)\n"
 	"  --joystick[=NUM]         Enable input with joystick (default: 0 = first\n"
 	"                           joystick)\n"
-	"  --platform=WORD          Specify version of game (allowed values: amiga,\n"
-	"                           atari, c64, fmtowns, nes, mac, pc, windows)\n"
+	"  --platform=WORD          Specify version of game (allowed values: acorn,\n"
+	"                           amiga, atari, c64, fmtowns, nes, mac, pc, segacd,\n"
+	"                           windows)\n"
 	"  --savepath=PATH          Path to where savegames are stored\n"
 	"  --soundfont=FILE         Select the SoundFont for MIDI playback (only\n"
 	"                           supported by some MIDI drivers)\n"
diff --git a/doc/05_01.tex b/doc/05_01.tex
index 220bfad68c..94894fb9df 100644
--- a/doc/05_01.tex
+++ b/doc/05_01.tex
@@ -34,8 +34,9 @@ Usage: scummvm [OPTIONS]... [GAME]\\
                           &(default: 0 = first drive)\\
   --joystick[=NUM]        &Enable input with joystick (default: 0 = first\\
                           &joystick)\\
-  --platform=WORD         &Specify version of game (allowed values: amiga,\\
-                          &atari, fmtowns, nes, mac, pc, windows)\\
+  --platform=WORD         &Specify version of game (allowed values: acorn,\\
+                          &amiga, atari, fmtowns, nes, mac, pc, segacd, 
+                          &windows)\\
   --savepath=PATH         &Path to where savegames are stored\\
   --multi-midi            &Enable combination of Adlib and native MIDI\\
   --soundfont             &Select the SoundFont for MIDI playback. (Only\\
@@ -44,7 +45,8 @@ Usage: scummvm [OPTIONS]... [GAME]\\
   --enable-gs             &Enable Roland GS mode for MIDI playback\\
   --output-rate=RATE      &Select output sample rate in Hz (e.g. 22050)\\
   --aspect-ratio          &Enable aspect ratio correction\\
-  --render-mode=MODE      &Enable additional render modes (cga, ega, hercGreen, hercAmber, amiga)\\
+  --render-mode=MODE      &Enable additional render modes (cga, ega, hercGreen,
+                          &hercAmber, amiga)\\
 \\
   --force-1x-overlay      &Make inner GUI 320x200\\
   --alt-intro             &Use alternative intro for CD versions of Beneath a\\
diff --git a/doc/05_04.tex b/doc/05_04.tex
index 83e1d86588..1816b6c3ac 100644
--- a/doc/05_04.tex
+++ b/doc/05_04.tex
@@ -6,7 +6,7 @@
 
 \subsection{Hot Keys}
 ScummVM supports various in game hotkeys. They differ between the SCUMM and
-Simon games.
+other games.
 \begin{itemize}
 \item Common:\\
   \begin{tabular}{ll}
@@ -46,6 +46,7 @@ Simon games.
 \item Beneath a Steel Sky:\\
   \begin{tabular}{ll}
     Ctrl 0-9 and Alt 0-9   & Load and save game state\\
+    Ctrl-d                 & Starts the debugger\\
     Ctrl-g                 & Runs in really REALLY fast mode\\
     F5                     & Displays a save/load box\\
     Escape                 & Skips the game intro\\
@@ -65,6 +66,15 @@ Simon games.
   \begin{tabular}{ll}
     Ctrl-d                 & Starts the debugger\\
     F1                     & Displays save/load box\\
+    F11                    & Quicksave\\
+    F12                    & Quickload\\
+    Escape                 & Skips cutscenes\\
+    Space                  & Skips current line of text\\
+  \end{tabular}
+\item The Legend of Kyrandia:\\
+  \begin{tabular}{ll}
+    Ctrl 0-9 and Alt 0-9   & Load and save game state\\
+    Ctrl-d                 & Starts the debugger\\
   \end{tabular}
 \item Simon the Sorcerer 1 \& 2:\\
   \begin{tabular}{ll}
@@ -77,7 +87,7 @@ Simon games.
     m                      & Music on/off\\
     s                      & Sound effects on/off\\
     b                      & Background sounds on/off\\
-    p                      & Toggles pause\\
+    p                      & Pauses\\
     t                      & Switch between speech and subtitles\\
     v                      & Switch between subtitles only and\\
                            & combined speech \& subtitles\\
diff --git a/doc/06.tex b/doc/06.tex
index 89b1eecbdf..3cfb466109 100644
--- a/doc/06.tex
+++ b/doc/06.tex
@@ -1,8 +1,16 @@
 \section {Savegames}
-Savegames are by default put in the current directory. You can specify the save
-in the config file by setting the savepath parameter. See the example config
-file later in this readme.
+Savegames are by default put in the current directory on some platforms and
+preset directories on others.  You can specify the save in the config file by
+setting the savepath parameter. See the example config file later in this
+readme.
 
+The platforms that currently have a different default directory are:
+%
+\begin{itemize}
+\item Mac OS X: \verb#$HOME/Documents/ScummVM Savegames/#
+\item Other unices: \verb#$HOME/.scummvm/#
+\end{itemize}
+%
 You can also use the environment variable SCUMMVM\_SAVEPATH to specify where to
 put save games. Don't forget the trailing directory separator. Also be aware
 that saved games may break between ScummVM releases.
diff --git a/doc/08.tex b/doc/08.tex
index 461eee6de4..8f98204597 100644
--- a/doc/08.tex
+++ b/doc/08.tex
@@ -53,7 +53,6 @@ An example config file looks as follows:
         [monkey2]
         path=C:\amiga_mi2\
         music_driver=windows
-        amiga=true
 \end{verbatim}
 %
 The following keywords are recognized:
@@ -102,7 +101,7 @@ The following keywords are recognized:
                         &         supported by some MIDI drivers.)\\
         native\_mt32    &bool     If true, disable GM emulation and assume that\\
                         &         there is a true Roland MT-32 available.\\
-	   enable\_gs      &bool     If true, enable Roland GS-specific features to\\
+        enable\_gs      &bool     If true, enable Roland GS-specific features to\\
                         &         enhance GM emulation. If native\_mt32 is also\\
                         &         true, the GS device will select an MT-32 map\\
                         &         to play the correct instruments.\\