[Scummvm-git-logs] scummvm master -> 00b8b797cf748baf17b7de88b2a8af8809f37611

[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:
f737513b59 COLONY: Initialize the offsets variable
00b8b797cf NANCY: Properly handle compressed CIF resources when exporting them


Commit: f737513b595dcd37dfe7c66ee1f40579296dd9d7
    https://github.com/scummvm/scummvm/commit/f737513b595dcd37dfe7c66ee1f40579296dd9d7
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-07-15T17:39:17+03:00

Commit Message:
COLONY: Initialize the offsets variable

Commit f343066 introduced a variable that is used conditionally, but
another variable is set to check if the variable has been initialized.
This fails under MSVC, as the variable is flagged as potentially
uninitialized. Initializing the variable fixes compilation under MSVC

Changed paths:
    engines/colony/animation.cpp


diff --git a/engines/colony/animation.cpp b/engines/colony/animation.cpp
index f2c7fca3f8f..0e5e3a28625 100644
--- a/engines/colony/animation.cpp
+++ b/engines/colony/animation.cpp
@@ -1047,7 +1047,7 @@ void ColonyEngine::drawColonyCoder(int animOx, int animOy) {
 	const int contentH = instrY + (int)instrLines.size() * instrLineH + 8;
 
 	Graphics::MacWindowBorder border;
-	Graphics::BorderOffsets offsets;
+	Graphics::BorderOffsets offsets = {};
 	bool hasBorder = false;
 	if (_wm) {
 		border.setWindowManager(_wm);


Commit: 00b8b797cf748baf17b7de88b2a8af8809f37611
    https://github.com/scummvm/scummvm/commit/00b8b797cf748baf17b7de88b2a8af8809f37611
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-07-15T17:39:18+03:00

Commit Message:
NANCY: Properly handle compressed CIF resources when exporting them

Changed paths:
    engines/nancy/resource.cpp


diff --git a/engines/nancy/resource.cpp b/engines/nancy/resource.cpp
index a25e5291871..c682578adcd 100644
--- a/engines/nancy/resource.cpp
+++ b/engines/nancy/resource.cpp
@@ -326,7 +326,9 @@ bool ResourceManager::exportCif(const Common::Path &name) {
 	if (stream) {
 		// .cifs are compressed, so we need to extract
 		CifFile cifFile(stream, name); // cifFile takes ownership of the current stream
-		stream = cifFile.createReadStreamRaw();
+		stream = cifFile.createReadStream();
+		if (!stream)
+			stream = cifFile.createReadStreamRaw();
 		info = cifFile.getInfo();
 	}
 
@@ -351,7 +353,9 @@ bool ResourceManager::exportCif(const Common::Path &name) {
 			}
 
 			if (tree) {
-				stream = tree->createReadStreamRaw(name);
+				stream = tree->createReadStreamForMember(name);
+				if (!stream)
+					stream = tree->createReadStreamRaw(name);
 				info = tree->getCifInfo(name);
 			} else {
 				// Finally, use SearchMan to get a loose file. This is useful if we want to add files that