[Scummvm-git-logs] scummvm master -> 438895bca6e01623ddf32abb79efd8b2b5ab7faf

[sev-]

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:
4322ef438b SCUMM: Hid noisy debug output
438895bca6 SCUMM: Implemented script hot-patching for baseball2001


Commit: 4322ef438b79b02155f02ee2130dc4a795ab8668
    https://github.com/scummvm/scummvm/commit/4322ef438b79b02155f02ee2130dc4a795ab8668
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-07-08T23:16:59+02:00

Commit Message:
SCUMM: Hid noisy debug output

Changed paths:
    engines/scumm/he/resource_he.cpp


diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp
index a820b18cc83..a7574da315e 100644
--- a/engines/scumm/he/resource_he.cpp
+++ b/engines/scumm/he/resource_he.cpp
@@ -411,7 +411,7 @@ int ScummEngine_v72he::getSoundResourceSize(ResId id) {
 }
 
 void ScummEngine_v90he::setResourceOffHeap(int typeId, int resId, int val) {
-	debug(0, "setResourceOffHeap: type %d resId %d toggle %d", typeId, resId, val);
+	debug(3, "setResourceOffHeap: type %d resId %d toggle %d", typeId, resId, val);
 	ResType type;
 
 	switch (typeId) {


Commit: 438895bca6e01623ddf32abb79efd8b2b5ab7faf
    https://github.com/scummvm/scummvm/commit/438895bca6e01623ddf32abb79efd8b2b5ab7faf
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-07-08T23:17:03+02:00

Commit Message:
SCUMM: Implemented script hot-patching for baseball2001

Changed paths:
    engines/scumm/resource.cpp


diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp
index e77ef62a3db..a02c0a0d252 100644
--- a/engines/scumm/resource.cpp
+++ b/engines/scumm/resource.cpp
@@ -664,6 +664,20 @@ int ScummEngine::loadResource(ResType type, ResId idx) {
 	if (roomNr == 0)
 		roomNr = _roomResource;
 
+	if (_game.id == GID_BASEBALL2001) {
+		Common::Path resFilename = Common::Path(Common::String::format("room-%d-%d.scr", roomNr, idx));
+		if (Common::File::exists(resFilename)) {
+			Common::File resFile;
+			if (resFile.open(resFilename)) {
+				size = resFile.size();
+				resFile.read(_res->createResource(type, idx, size), size);
+				debug(1, "loadResource(%s,%d): resource loaded from file %s", nameOfResType(type), idx, resFilename.toString().c_str());
+
+				return 1;
+			}
+		}
+	}
+
 	fileOffs = getResourceRoomOffset(type, idx);
 	if (fileOffs == RES_INVALID_OFFSET)
 		return 0;
@@ -866,13 +880,13 @@ byte *ResourceManager::createResource(ResType type, ResId idx, uint32 size) {
 	}
 
 	// HE70+ reuses the resource without deallocating it if it has the same size.
-	// 
+	//
 	// Not replicating this behavior this can creare very rare gfx corruption issues, e.g.
 	// #13864 ("SCUMM/HE: Blue's Treasure Hunt - Missing Backgrounds during some animations"),
 	// in which a WIZ transparent (color 5) image is prepared for it to serve as a canvas for
 	// some Smacker videos, only for the former to be nuked and replaced with an all 0 (black)
 	// empty image.
-	// 
+	//
 	// This is just one of the many differences of our system versus the HE resource allocation system...
 	// The whole thing should probably be rewritten at some point to match the source code. ;-)
 	if (_vm->_game.heversion >= 70 && _types[type][idx]._address && _types[type][idx]._size == size) {
@@ -1719,7 +1733,7 @@ void ScummEngine::applyWorkaroundIfNeeded(ResType type, int idx) {
 		return;
 
 	int size = getResourceSize(type, idx);
-	
+
 	// WORKAROUND: Maniac Mansion (NES) logo scroll gets stuck because ScummVM uses a 256px wide view.
 	// The original expects a 224px wide screen, so the camera never reaches the script's wait threshold.
 	// Patch script 120 at runtime by locating the camera-wait loop and changing its compare.