[Scummvm-git-logs] scummvm branch-2-5 -> af2b861a4285088b7bd1d952e99aba896fff99a2

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
af2b861a42 GRIM: Fixed #12938. Convert ScummVM "talkspeed" default to engine default


Commit: af2b861a4285088b7bd1d952e99aba896fff99a2
    https://github.com/scummvm/scummvm/commit/af2b861a4285088b7bd1d952e99aba896fff99a2
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-10-01T22:27:29+02:00

Commit Message:
GRIM: Fixed #12938. Convert ScummVM "talkspeed" default to engine default

Changed paths:
    NEWS.md
    engines/grim/registry.cpp


diff --git a/NEWS.md b/NEWS.md
index a2db440649..36f1220a3c 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,6 +1,11 @@
 For a more comprehensive changelog of the latest experimental code, see:
         https://github.com/scummvm/scummvm/commits/
 
+#### 2.5.1 (XXXX-XX-XX)
+
+ Grim:
+   - Fixed default "Talk Speed" option value.
+
 #### 2.5.0 "Twenty years ago today..." (2021-10-09)
 
  New games:
diff --git a/engines/grim/registry.cpp b/engines/grim/registry.cpp
index 614b736812..11ecda0ac4 100644
--- a/engines/grim/registry.cpp
+++ b/engines/grim/registry.cpp
@@ -98,6 +98,12 @@ Registry::Registry() :
 	ConfMan.registerDefault("talkspeed", 179);
 	ConfMan.registerDefault("game_devel_mode", false);
 
+	// The "talkspeed" setting is by default 60 for ScummVM,
+	// detect it and convert to engine default
+	if (ConfMan.getInt("talkspeed") == 60) {
+		ConfMan.setInt("talkspeed", 179);
+	}
+
 	// Read settings
 	_spewOnError.setString(ConfMan.get("spew_on_error"));
 	_dataPath.setString(ConfMan.get("path"));