[Scummvm-cvs-logs] SF.net SVN: scummvm:[34596] scummvm/trunk/engines/scumm

[fingolfin at users.sourceforge.net]

Revision: 34596
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34596&view=rev
Author:   fingolfin
Date:     2008-09-17 18:56:13 +0000 (Wed, 17 Sep 2008)

Log Message:
-----------
Patch #2060517: SCUMM: engine sets incorrect talkspeed value

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/input.cpp
    scummvm/trunk/engines/scumm/script.cpp
    scummvm/trunk/engines/scumm/script_v8.cpp
    scummvm/trunk/engines/scumm/scumm.cpp
    scummvm/trunk/engines/scumm/scumm.h

Modified: scummvm/trunk/engines/scumm/input.cpp
===================================================================
--- scummvm/trunk/engines/scumm/input.cpp	2008-09-17 18:26:44 UTC (rev 34595)
+++ scummvm/trunk/engines/scumm/input.cpp	2008-09-17 18:56:13 UTC (rev 34596)
@@ -523,7 +523,7 @@
 		_defaultTalkDelay = 9 - runDialog(dlg);
 
 		// Save the new talkspeed value to ConfMan
-		setTalkspeed(_defaultTalkDelay);
+		setTalkDelay(_defaultTalkDelay);
 
 		if (VAR_CHARINC != 0xFF)
 			VAR(VAR_CHARINC) = _defaultTalkDelay;

Modified: scummvm/trunk/engines/scumm/script.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script.cpp	2008-09-17 18:26:44 UTC (rev 34595)
+++ scummvm/trunk/engines/scumm/script.cpp	2008-09-17 18:56:13 UTC (rev 34596)
@@ -625,10 +625,10 @@
 
 		if (var == VAR_CHARINC) {
 			if (ConfMan.hasKey("talkspeed")) {
-				value = getTalkspeed();
+				value = getTalkDelay();
 			} else {
 				// Save the new talkspeed value to ConfMan
-				setTalkspeed(value);
+				setTalkDelay(value);
 			}
 		}
 

Modified: scummvm/trunk/engines/scumm/script_v8.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v8.cpp	2008-09-17 18:26:44 UTC (rev 34595)
+++ scummvm/trunk/engines/scumm/script_v8.cpp	2008-09-17 18:56:13 UTC (rev 34596)
@@ -424,10 +424,10 @@
 
 		if (var == VAR_CHARINC) {
 			if (ConfMan.hasKey("talkspeed")) {
-				value = getTalkspeed();
+				value = getTalkDelay();
 			} else {
 				// Save the new talkspeed value to ConfMan
-				setTalkspeed(value);
+				setTalkDelay(value);
 			}
 		}
 

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2008-09-17 18:26:44 UTC (rev 34595)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2008-09-17 18:56:13 UTC (rev 34596)
@@ -1693,17 +1693,17 @@
 	if (VAR_VOICE_MODE != 0xFF)
 		VAR(VAR_VOICE_MODE) = _voiceMode;
 
-	_defaultTalkDelay = getTalkspeed();
+	_defaultTalkDelay = getTalkDelay();
 	if (VAR_CHARINC != 0xFF)
 		VAR(VAR_CHARINC) = _defaultTalkDelay;
 }
 
-void ScummEngine::setTalkspeed(int talkspeed) {
-	ConfMan.setInt("talkspeed", (talkspeed * 255 + 9 / 2) / 9);
+void ScummEngine::setTalkDelay(int talkdelay) {
+	ConfMan.setInt("talkspeed", ((9 - talkdelay) * 255 + 9 / 2) / 9);
 }
 
-int ScummEngine::getTalkspeed() {
-	return (ConfMan.getInt("talkspeed") * 9 + 255 / 2) / 255;
+int ScummEngine::getTalkDelay() {
+	return 9 - (ConfMan.getInt("talkspeed") * 9 + 255 / 2) / 255;
 }
 
 

Modified: scummvm/trunk/engines/scumm/scumm.h
===================================================================
--- scummvm/trunk/engines/scumm/scumm.h	2008-09-17 18:26:44 UTC (rev 34595)
+++ scummvm/trunk/engines/scumm/scumm.h	2008-09-17 18:56:13 UTC (rev 34596)
@@ -463,8 +463,8 @@
 	void loadCJKFont();
 	void setupMusic(int midi);
 	virtual void syncSoundSettings();
-	void setTalkspeed(int talkspeed);
-	int getTalkspeed();
+	void setTalkDelay(int talkdelay);
+	int getTalkDelay();
 
 	// Scumm main loop & helper functions.
 	virtual void scummLoop(int delta);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.