[Scummvm-git-logs] scummvm branch-2-6 -> bfbeef45bdcc60307a507000809b6f4dbbc4f140

[dreammaster]

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:
bfbeef45bd CHEWY: Workaround to enable the taxi in English Big City scene


Commit: bfbeef45bdcc60307a507000809b6f4dbbc4f140
    https://github.com/scummvm/scummvm/commit/bfbeef45bdcc60307a507000809b6f4dbbc4f140
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2022-06-27T21:39:39-07:00

Commit Message:
CHEWY: Workaround to enable the taxi in English Big City scene

Changed paths:
    engines/chewy/atds.cpp
    engines/chewy/inits.cpp


diff --git a/engines/chewy/atds.cpp b/engines/chewy/atds.cpp
index cc61f75efbd..d92fa82ae85 100644
--- a/engines/chewy/atds.cpp
+++ b/engines/chewy/atds.cpp
@@ -1017,7 +1017,13 @@ uint32 Atdsys::getAtdsStreamSize() const {
 }
 
 Common::StringArray Atdsys::getTextArray(uint dialogNum, uint entryNum, int type, int subEntry) {
-	if (!getControlBit(entryNum, ATS_ACTIVE_BIT))
+	if (dialogNum == 45 && entryNum == 295 && type == 1 && subEntry == -1 &&
+			g_engine->getLanguage() == Common::EN_ANY) {
+		// WORKAROUND: Taxi hotspot in room 45 (Big City)
+		Common::StringArray results;
+		results.push_back("Taxi");
+		return results;
+	} else if (!getControlBit(entryNum, ATS_ACTIVE_BIT))
 		return _text->getTextArray(dialogNum, entryNum, type, subEntry);
 	else
 		return Common::StringArray();
diff --git a/engines/chewy/inits.cpp b/engines/chewy/inits.cpp
index a628f935bfd..ef669726d50 100644
--- a/engines/chewy/inits.cpp
+++ b/engines/chewy/inits.cpp
@@ -179,6 +179,10 @@ void new_game() {
 		_G(gameState).Ats[i * MAX_ATS_STATUS] = f.readByte();
 	f.close();
 
+	// WORKAROUND: For English version, taxi hotspot in
+	// room 45 (Big City) isn't turned on by default
+	_G(gameState).Ats[295 * MAX_ATS_STATUS] = ATS_ACTION_BIT;
+
 	if (!f.open(INV_ATS_STEUER))
 		error("Error reading file: %s", INV_ATS_STEUER);
 	for (int16 i = 0; i < MAX_MOV_OBJ; i++)