[Scummvm-git-logs] scummvm master -> de868471845e2af6151df40d3fecf910e6eaf904

[bgK]

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:
de86847184 MOHAW: RIVEN: Added more localized 25th resource id workarounds


Commit: de868471845e2af6151df40d3fecf910e6eaf904
    https://github.com/scummvm/scummvm/commit/de868471845e2af6151df40d3fecf910e6eaf904
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-07-11T20:32:08+02:00

Commit Message:
MOHAW: RIVEN: Added more localized 25th resource id workarounds

Fixes Trac#10625, Fixes Trac#10624.

Changed paths:
    engines/mohawk/riven.cpp


diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index 4285ef7..5d02317 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -402,13 +402,19 @@ void MohawkEngine_Riven::changeToStack(uint16 stackId) {
 		MohawkArchive *mhk = new MohawkArchive();
 		if (mhk->openFile(languageDatafile)) {
 
-			if (stackId == kStackOspit && (getLanguage() != Common::EN_ANY || getLanguage() != Common::RU_RUS)) {
+			if (stackId == kStackOspit && getLanguage() != Common::EN_ANY && getLanguage() != Common::RU_RUS) {
 				// WORKAROUND: The international CD versions were repacked for the 25th anniversary release
 				// so they share the same resources as the English DVD version. The resource IDs for the DVD
 				// version resources have a delta of 1 in their numbering when compared the the CD version
 				// resources for Gehn's office. Unfortunately this delta was not compensated when repacking
 				// the archives. We need to do it here at run time...
 				mhk->offsetResourceIDs(ID_TBMP, 196, 1);
+			} else if (stackId == kStackJspit && getLanguage() != Common::EN_ANY && getLanguage() != Common::RU_RUS) {
+				// WORKAROUND: Same thing with Gehn's imager in the School in Jungle Island.
+				mhk->offsetResourceIDs(ID_TMOV, 342, -2);
+			} else if (stackId == kStackGspit && getLanguage() == Common::PL_POL) {
+				// WORKAROUND: Same thing for the advertisement easter egg on Garden Island.
+				mhk->offsetResourceIDs(ID_TMOV, 148, 2);
 			}
 
 			_mhk.push_back(mhk);