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

[bluegr]

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

Summary:
0e6bac90a4 SKY: Assign boolean values to boolean variable _logicClick
cb57759aed NANCY: Fix item texts that are 60 characters in length


Commit: 0e6bac90a4b155b7980545b59dd9d7a5798dc054
    https://github.com/scummvm/scummvm/commit/0e6bac90a4b155b7980545b59dd9d7a5798dc054
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-07-10T20:34:53+03:00

Commit Message:
SKY: Assign boolean values to boolean variable _logicClick

Fixes compilation in MSVC

Changed paths:
    engines/sky/mouse.cpp


diff --git a/engines/sky/mouse.cpp b/engines/sky/mouse.cpp
index aceaa3a94f5..7a6a5ee6780 100644
--- a/engines/sky/mouse.cpp
+++ b/engines/sky/mouse.cpp
@@ -390,7 +390,7 @@ void Mouse::textChooser(uint16 xPos, uint16 yPos) {
 			itemData = _skyCompact->fetchCpt(_touchId);
 			if (itemData->mouseClick)
 				_skyLogic->mouseScript(itemData->mouseClick, itemData);
-			_logicClick = 2;
+			_logicClick = true;
 			_touchId = 0;
 			_mMode = GAMEPLAY;
 		}


Commit: cb57759aedaa22bf7991e6da9b75b5142c6ce3b0
    https://github.com/scummvm/scummvm/commit/cb57759aedaa22bf7991e6da9b75b5142c6ce3b0
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-07-10T20:34:54+03:00

Commit Message:
NANCY: Fix item texts that are 60 characters in length

Fix #16934

Changed paths:
    engines/nancy/enginedata.cpp


diff --git a/engines/nancy/enginedata.cpp b/engines/nancy/enginedata.cpp
index b056d2a667c..a6d0e1bb5f7 100644
--- a/engines/nancy/enginedata.cpp
+++ b/engines/nancy/enginedata.cpp
@@ -169,12 +169,12 @@ INV::INV(Common::SeekableReadStream *chunkStream) : EngineData(chunkStream) {
 
 	s.skip(0x10, kGameTypeVampire, kGameTypeNancy9); // unknown rect, same size as a hotspot
 
-	byte textBuf[60];
+	byte textBuf[61];
 
 	if (s.getVersion() >= kGameTypeNancy2) {
 		cantSound.readNormal(*chunkStream);
 		s.syncBytes(textBuf, 60);
-		textBuf[59] = '\0';
+		textBuf[60] = '\0';
 		cantText = (char *)textBuf;
 	}
 
@@ -210,18 +210,18 @@ INV::INV(Common::SeekableReadStream *chunkStream) : EngineData(chunkStream) {
 
 		if (s.getVersion() == kGameTypeNancy2) {
 			s.syncBytes(textBuf, 60);
-			textBuf[59] = '\0';
+			textBuf[60] = '\0';
 			assembleTextLine((char *)textBuf, item.cantText, 60);
 
 			s.syncBytes(textBuf, 60);
-			textBuf[59] = '\0';
+			textBuf[60] = '\0';
 			assembleTextLine((char *)textBuf, item.cantTextNotHolding, 60);
 
 			item.cantSound.readNormal(*chunkStream);
 			item.cantSoundNotHolding.readNormal(*chunkStream);
 		} else if (s.getVersion() >= kGameTypeNancy3 && s.getVersion() <= kGameTypeNancy8) {
 			s.syncBytes(textBuf, 60);
-			textBuf[59] = '\0';
+			textBuf[60] = '\0';
 			assembleTextLine((char *)textBuf, item.cantText, 60);
 
 			item.cantSound.readNormal(*chunkStream);
@@ -230,7 +230,7 @@ INV::INV(Common::SeekableReadStream *chunkStream) : EngineData(chunkStream) {
 				if (s.getVersion() >= kGameTypeNancy10)
 					readFilename(s, item.cantSounds[j].name);
 				s.syncBytes(textBuf, 60);
-				textBuf[59] = '\0';
+				textBuf[60] = '\0';
 				assembleTextLine((char *)textBuf, item.cantTexts[j], 60);
 				if (s.getVersion() == kGameTypeNancy9)
 					readFilename(s, item.cantSounds[j].name);