Ticket #8914: scumm-talkspeed-slider-3.patch

engines/scumm/input.cpp

@@ -527 +527 @@
                 _defaultTalkDelay = 9 - runDialog(dlg);
 
                 // Save the new talkspeed value to ConfMan
-                setTalkspeed(_defaultTalkDelay);
+                setTalkDelay(_defaultTalkDelay);
 
                 if (VAR_CHARINC != 0xFF)
                         VAR(VAR_CHARINC) = _defaultTalkDelay;

engines/scumm/scumm.cpp

@@ -1690 +1690 @@
         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;
 }
 
 

engines/scumm/scumm.h

@@ -463 +463 @@
         void loadCJKFont();
         void setupMusic(int midi);
         void updateSoundSettings();
-        void setTalkspeed(int talkspeed);
-        int getTalkspeed();
+        void setTalkDelay(int talkdelay);
+        int getTalkDelay();
 
         // Scumm main loop & helper functions.
         virtual void scummLoop(int delta);

engines/scumm/script_v8.cpp

@@ -424 +424 @@
 
                 if (var == VAR_CHARINC) {
                         if (ConfMan.hasKey("talkspeed")) {
-                                value = getTalkspeed();
+                                value = getTalkDelay();
                         } else {
                                 // Save the new talkspeed value to ConfMan
-                                setTalkspeed(value);
+                                setTalkDelay(value);
                         }
                 }
 

engines/scumm/script.cpp

@@ -625 +625 @@
 
                 if (var == VAR_CHARINC) {
                         if (ConfMan.hasKey("talkspeed")) {
-                                value = getTalkspeed();
+                                value = getTalkDelay();
                         } else {
                                 // Save the new talkspeed value to ConfMan
-                                setTalkspeed(value);
+                                setTalkDelay(value);
                         }
                 }