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

1 files changed, 5 insertions, 5 deletions

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;
 }