[Scummvm-git-logs] scummvm branch-2-5 -> 1a9b67c53001a59f551efc97706d9b9764c3e842

[antoniou79]

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:
1a9b67c530 STARK: Fix bad subtitle for Cortez in theater


Commit: 1a9b67c53001a59f551efc97706d9b9764c3e842
    https://github.com/scummvm/scummvm/commit/1a9b67c53001a59f551efc97706d9b9764c3e842
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2021-10-03T13:17:04+03:00

Commit Message:
STARK: Fix bad subtitle for Cortez in theater

Fix for bug https://bugs.scummvm.org/ticket/12967

Changed paths:
    engines/stark/resources/speech.cpp
    engines/stark/services/settings.cpp
    engines/stark/services/settings.h


diff --git a/engines/stark/resources/speech.cpp b/engines/stark/resources/speech.cpp
index e04d198c68..d42d83cd0f 100644
--- a/engines/stark/resources/speech.cpp
+++ b/engines/stark/resources/speech.cpp
@@ -25,6 +25,7 @@
 #include "engines/stark/formats/xrc.h"
 
 #include "engines/stark/services/services.h"
+#include "engines/stark/services/settings.h"
 #include "engines/stark/services/dialogplayer.h"
 #include "engines/stark/services/global.h"
 #include "engines/stark/services/stateprovider.h"
@@ -151,6 +152,18 @@ void Speech::readData(Formats::XRCReadStream *stream) {
 
 	_phrase = stream->readString();
 	_character = stream->readSint32LE();
+
+	// bug fix for #12967 (STARK: Cortez says "no", but subtitles say "si")
+	if (StarkSettings->getLanguage() == Common::EN_ANY
+	    && _character == 1 // Cortez
+	    && getIndex() == 1
+	    && getSubType() == 0
+	    && getName().equals("Cortez_Laying low #1")) {
+		_phrase = "Nyo! So it was a good thing I didn't stick my head out the door to look for you, then, no?";
+	}
+
+	// For debug purposes
+	//printData();
 }
 
 void Speech::onGameLoop() {
diff --git a/engines/stark/services/settings.cpp b/engines/stark/services/settings.cpp
index aa4f1ccc89..3fc3e96aaf 100644
--- a/engines/stark/services/settings.cpp
+++ b/engines/stark/services/settings.cpp
@@ -118,4 +118,8 @@ bool Settings::shouldIgnoreFontSettings() const {
 	return ConfMan.getBool("ignore_font_settings") && _language == Common::EN_ANY;
 }
 
+Common::Language Settings::getLanguage() const {
+	return _language;
+}
+
 } // End of namespace Stark
diff --git a/engines/stark/services/settings.h b/engines/stark/services/settings.h
index 713deaa91c..5f30017e5e 100644
--- a/engines/stark/services/settings.h
+++ b/engines/stark/services/settings.h
@@ -129,6 +129,11 @@ public:
 	 */
 	bool shouldIgnoreFontSettings() const;
 
+	/**
+	 * Return the game language (which is currently initialized with the Advanced Detector description language field value)
+	 */
+	Common::Language getLanguage() const;
+
 private:
 	Audio::Mixer *_mixer;
 	bool _hasLowRes;