[Scummvm-git-logs] scummvm master -> 9a438b6492fa42dfd4d9c3a387c069284f183bd0

mikrosk noreply at scummvm.org
Fri Jul 4 12:29:15 UTC 2025


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:
9a438b6492 BACKENDS: ATARI: Remove harmful assert


Commit: 9a438b6492fa42dfd4d9c3a387c069284f183bd0
    https://github.com/scummvm/scummvm/commit/9a438b6492fa42dfd4d9c3a387c069284f183bd0
Author: Miro Kropacek (miro.kropacek at gmail.com)
Date: 2025-07-04T14:14:46+02:00

Commit Message:
BACKENDS: ATARI: Remove harmful assert

Cursor's srcSurface is formally PIXELFORMAT_CLUT8 but this is not true,
it's 4-bit or 8-bit bitplanes. On the other hand, AtariSurface is
PIXELFORMAT_CLUT8, PIXELFORMAT_RGB332 or PIXELFORMAT_RGB121 so these
can't be asserted for equality.

Changed paths:
    backends/graphics/atari/atari-graphics.cpp
    backends/graphics/atari/atari-surface.cpp


diff --git a/backends/graphics/atari/atari-graphics.cpp b/backends/graphics/atari/atari-graphics.cpp
index ab685248f58..30fe3ddf2c4 100644
--- a/backends/graphics/atari/atari-graphics.cpp
+++ b/backends/graphics/atari/atari-graphics.cpp
@@ -606,7 +606,7 @@ void AtariGraphicsManager::unlockScreen() {
 }
 
 void AtariGraphicsManager::fillScreen(uint32 col) {
-	atari_debug("fillScreen: %d", col);
+	//atari_debug("fillScreen: %d", col);
 
 	Graphics::Surface &dstSurface = *lockScreen();
 
diff --git a/backends/graphics/atari/atari-surface.cpp b/backends/graphics/atari/atari-surface.cpp
index 14997e1b1cf..fbd998d07bb 100644
--- a/backends/graphics/atari/atari-surface.cpp
+++ b/backends/graphics/atari/atari-surface.cpp
@@ -207,7 +207,6 @@ void AtariSurface::drawMaskedSprite(
 	const Graphics::Surface &boundingSurface,
 	int destX, int destY,
 	const Common::Rect &subRect) {
-	assert(srcSurface.format == format);
 	assert(srcSurface.w == srcMask.w);
 	assert(srcSurface.h == srcMask.h);
 




More information about the Scummvm-git-logs mailing list