[Scummvm-git-logs] scummvm master -> 34488801711c4b523868dbbb3659ab0075de3420

[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:
3448880171 Grim: Fixed #12938. Convert ScummVM "talkspeed" default to engine default


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

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

Changed paths:
    engines/grim/registry.cpp


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"));