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

[bluegr]

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:
d4cef0e3ad SCUMM: Use correct variable for current room


Commit: d4cef0e3ad3f20d1cfc02309cc311e0ce37e5245
    https://github.com/scummvm/scummvm/commit/d4cef0e3ad3f20d1cfc02309cc311e0ce37e5245
Author: Ben Castricum (github at bencastricum.nl)
Date: 2021-10-24T19:49:19+03:00

Commit Message:
SCUMM: Use correct variable for current room

Changed paths:
    engines/scumm/string.cpp


diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index 8adf34e787..b516ccacfa 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -1357,9 +1357,9 @@ int ScummEngine::convertMessageToString(const byte *msg, byte *dst, int dstSize)
 			error("convertMessageToString: buffer overflow");
 	}
 
-	// WORKAROUND bug #12249 (occurs also in original): Missing actor animation in German version of SAMNMAX
+	// WORKAROUND bug #12249 (occurs also in original): Missing actor animation in German versions of SAMNMAX
 	// Adding the missing animation escape sequence while copying the text fixes it.
-	if (_game.id == GID_SAMNMAX && _roomResource == 56 && vm.slot[_currentScript].number == 200 && _language == Common::DE_DEU) {
+	if (_game.id == GID_SAMNMAX && _currentRoom == 56 && vm.slot[_currentScript].number == 200 && _language == Common::DE_DEU) {
 		// 0xE5E6 is the CD version, 0xE373 is for the floppy version
 		if (vm.slot[_currentScript].offs == 0xE5E6 || vm.slot[_currentScript].offs == 0xE373) {
 			*dst++ = 0xFF;