[Scummvm-git-logs] scummvm master -> 8f70486311b0219c6e445a03476a51ea6718f4ad

[eriktorbjorn]

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

Summary:
8f70486311 AWE: Draw bitmaps to the long-term buffer (bug #16013)


Commit: 8f70486311b0219c6e445a03476a51ea6718f4ad
    https://github.com/scummvm/scummvm/commit/8f70486311b0219c6e445a03476a51ea6718f4ad
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2025-06-23T19:51:33+02:00

Commit Message:
AWE: Draw bitmaps to the long-term buffer (bug #16013)

This is how rawgl did it, so I guess it was an accidental change in
ScummVM. This fixes the panorama view through the window, and the splash
screens on startup. Well, almost. I'm getting the Out of This World
screens for my copy of Another World, but at least the drawing works.

Changed paths:
    engines/awe/video.cpp
    engines/scumm/detection_internal.h


diff --git a/engines/awe/video.cpp b/engines/awe/video.cpp
index a0bf7e146fd..faac6603eee 100644
--- a/engines/awe/video.cpp
+++ b/engines/awe/video.cpp
@@ -463,7 +463,7 @@ static void yflip(const uint8 *src, int w, int h, uint8 *dst) {
 }
 
 void Video::scaleBitmap(const uint8 *src, int fmt) {
-	_graphics->drawBitmap(_buffers[0], src, BITMAP_W, BITMAP_H, fmt);
+	_graphics->drawBitmap(0, src, BITMAP_W, BITMAP_H, fmt);
 }
 
 void Video::copyBitmapPtr(const uint8 *src, uint32 size) {
diff --git a/engines/scumm/detection_internal.h b/engines/scumm/detection_internal.h
index 6c0c189d47c..3b81d0e354d 100644
--- a/engines/scumm/detection_internal.h
+++ b/engines/scumm/detection_internal.h
@@ -520,7 +520,7 @@ static void detectGames(const Common::FSList &fslist, Common::List<DetectorResul
 
 				debugC(2, kDebugGlobalDetection, "Falling back to disk-based detection");
 			} else {
-				tmp = d.node.createReadStream();
+				tmp = Common::MacResManager::openFileOrDataFork(d.node.getPath());
 			}
 
 			Common::String md5str;