Revert talkspeed changes, while still only using the game specific talkspeed setting (if it exists). And clarify the talkspeed differences between games in the README.

svn-id: r36299

6 files changed, 16 insertions, 14 deletions

diff --git a/README b/README
index f43672080b..0c78155064 100644
--- a/README
+++ b/README
@@ -838,7 +838,8 @@ arguments -- see the next section.
                            Steel Sky and Flight of the Amazon Queen
   --copy-protection        Enable copy protection in games, when
                            ScummVM disables it by default.
-  --talkspeed=NUM          Set talk speed for games (default: 60)
+  --talkspeed=NUM          Set talk delay for SCUMM games, or talk speed for
+                           other games (default: 60)
   --demo-mode              Start demo mode of Maniac Mansion (Classic version)
   --tempo=NUM              Set music tempo (in percent, 50-200) for SCUMM games
                            (default: 100)
@@ -1759,7 +1760,8 @@ The following keywords are recognized:
                                  jp, zh, kr, se, gb, hb, cz, ru)
         speech_mute     bool     If true, speech is muted
         subtitles       bool     Set to true to enable subtitles.
-        talkspeed       number   Text speed
+        talkspeed       number   Text delay in SCUMM games, or text speed in
+                                 other games.
 
         fullscreen      bool     Fullscreen mode
         aspect_ratio    bool     Enable aspect ratio correction
diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index 6e8995d726..77a7301913 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -518,7 +518,7 @@ void ScummEngine::processKeyboard(Common::KeyState lastKeyHit) {
 		_defaultTalkDelay = 9 - runDialog(dlg);
 
 		// Save the new talkspeed value to ConfMan
-		setTalkDelay(_defaultTalkDelay);
+		setTalkSpeed(_defaultTalkDelay);
 
 		if (VAR_CHARINC != 0xFF)
 			VAR(VAR_CHARINC) = _defaultTalkDelay;
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index d2d4efc719..a58f22b70d 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -628,10 +628,10 @@ void ScummEngine::writeVar(uint var, int value) {
 			// look at the target specific settings, assuming that any global
 			// value is likely to be bogus. See also bug #2251765.
 			if (ConfMan.hasKey("talkspeed", _targetName)) {
-				value = getTalkDelay();
+				value = getTalkSpeed();
 			} else {
 				// Save the new talkspeed value to ConfMan
-				setTalkDelay(value);
+				setTalkSpeed(value);
 			}
 		}
 
diff --git a/engines/scumm/script_v8.cpp b/engines/scumm/script_v8.cpp
index b85f123e8d..ec464feef9 100644
--- a/engines/scumm/script_v8.cpp
+++ b/engines/scumm/script_v8.cpp
@@ -429,10 +429,10 @@ void ScummEngine_v8::writeVar(uint var, int value) {
 			// look at the target specific settings, assuming that any global
 			// value is likely to be bogus. See also bug #2251765.
 			if (ConfMan.hasKey("talkspeed", _targetName)) {
-				value = getTalkDelay();
+				value = getTalkSpeed();
 			} else {
 				// Save the new talkspeed value to ConfMan
-				setTalkDelay(value);
+				setTalkSpeed(value);
 			}
 		}
 
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 01e2947712..19aa7324e4 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1707,18 +1707,18 @@ void ScummEngine::syncSoundSettings() {
 		VAR(VAR_VOICE_MODE) = _voiceMode;
 
 	if (ConfMan.hasKey("talkspeed", _targetName)) {
-		_defaultTalkDelay = getTalkDelay();
+		_defaultTalkDelay = getTalkSpeed();
 		if (VAR_CHARINC != 0xFF)
 			VAR(VAR_CHARINC) = _defaultTalkDelay;
 	}
 }
 
-void ScummEngine::setTalkDelay(int talkdelay) {
-	ConfMan.setInt("talkspeed", ((9 - talkdelay) * 255 + 9 / 2) / 9);
+void ScummEngine::setTalkSpeed(int talkspeed) {
+	ConfMan.setInt("talkspeed", (talkspeed * 255 + 9 / 2) / 9);
 }
 
-int ScummEngine::getTalkDelay() {
-	return 9 - (ConfMan.getInt("talkspeed") * 9 + 255 / 2) / 255;
+int ScummEngine::getTalkSpeed() {
+	return (ConfMan.getInt("talkspeed") * 9 + 255 / 2) / 255;
 }
 
 
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index e843c201a7..f99f37d857 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -474,8 +474,8 @@ protected:
 	virtual void loadLanguageBundle() {}
 	void loadCJKFont();
 	void setupMusic(int midi);
-	void setTalkDelay(int talkdelay);
-	int getTalkDelay();
+	void setTalkSpeed(int talkspeed);
+	int getTalkSpeed();
 
 	// Scumm main loop & helper functions.
 	virtual void scummLoop(int delta);