[Scummvm-git-logs] scummvm master -> 75437580c2d4ee26cbfc15b6c5c5d9380a26cac3

[Strangerke]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
a5c16e9fe0 WAYNESWORLD: Fix logic issue that prevented the mayor to appear after the pizzathon
f76021f26f WAYNESWORLD: Fix crash when displaying text from c04r2
75437580c2 WAYNESWORLD: Avoid a crash in loadString()


Commit: a5c16e9fe04eea39c2129f0245722d888910a025
    https://github.com/scummvm/scummvm/commit/a5c16e9fe04eea39c2129f0245722d888910a025
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-03-26T02:35:41+01:00

Commit Message:
WAYNESWORLD: Fix logic issue that prevented the mayor to appear after the pizzathon

Changed paths:
    engines/waynesworld/gamelogic.cpp


diff --git a/engines/waynesworld/gamelogic.cpp b/engines/waynesworld/gamelogic.cpp
index a07713e75ff..53453be6210 100644
--- a/engines/waynesworld/gamelogic.cpp
+++ b/engines/waynesworld/gamelogic.cpp
@@ -3939,7 +3939,7 @@ void GameLogic::r8_refreshRoomBackground() {
 	if (!(_r8_flags & 0x01)) {
 		_vm->drawRoomImageToBackground("opendoor.pcx", 259, 51);
 	}
-	if (!(_r8_flags & 0x08) && ((_r8_flags & 0x80) || (_r38_flags & 0x08))) {
+	if (!(_r8_flags & 0x08) && (!(_r8_flags & 0x80) || (_r38_flags & 0x08))) {
 		_vm->_roomEventNum = 1;
 	}
 	if (!_vm->_hasRoomAnimationCallback) {


Commit: f76021f26f5caca1f684be4524b2a7f879cd5275
    https://github.com/scummvm/scummvm/commit/f76021f26f5caca1f684be4524b2a7f879cd5275
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-03-26T02:58:15+01:00

Commit Message:
WAYNESWORLD: Fix crash when displaying text from c04r2

Changed paths:
    engines/waynesworld/gamelogic.cpp


diff --git a/engines/waynesworld/gamelogic.cpp b/engines/waynesworld/gamelogic.cpp
index 53453be6210..70984229d99 100644
--- a/engines/waynesworld/gamelogic.cpp
+++ b/engines/waynesworld/gamelogic.cpp
@@ -533,7 +533,7 @@ void GameLogic::handleDialogReply(int index, int x, int y) {
     if (index < 537) {
         _vm->displayText("c04r", index, 0, x, y, 0);
     } else {
-        _vm->displayText("c04r2", index, 0, x, y, 0);
+        _vm->displayText("c04r2", index - 537, 0, x, y, 0);
     }
 
     switch (_vm->_currentRoomNumber) {


Commit: 75437580c2d4ee26cbfc15b6c5c5d9380a26cac3
    https://github.com/scummvm/scummvm/commit/75437580c2d4ee26cbfc15b6c5c5d9380a26cac3
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-03-26T02:59:20+01:00

Commit Message:
WAYNESWORLD: Avoid a crash in loadString()

Changed paths:
    engines/waynesworld/waynesworld.cpp


diff --git a/engines/waynesworld/waynesworld.cpp b/engines/waynesworld/waynesworld.cpp
index b62592d3319..6b9bee6a6ed 100644
--- a/engines/waynesworld/waynesworld.cpp
+++ b/engines/waynesworld/waynesworld.cpp
@@ -709,6 +709,10 @@ Common::String WaynesWorldEngine::loadString(const char *filename, int index, in
 		if (textBuffer[i] == 0x2b)
 			break;
 	}
+
+	// Safeguard in case the string takes 60 characters, overwrite the last character instead of writing out of boundaries
+	if (i >= kMaxStringLen)
+		i = kMaxStringLen - 1;
 	textBuffer[i] = 0;
 	return Common::String(textBuffer);
 }