[Scummvm-git-logs] scummvm master -> 23ada878875a66730435607d159c4dbabbe615e8

[sluicebox]

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

Summary:
23ada87887 DREAMWEB: Change assert to warning in `showAllEx`


Commit: 23ada878875a66730435607d159c4dbabbe615e8
    https://github.com/scummvm/scummvm/commit/23ada878875a66730435607d159c4dbabbe615e8
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2024-11-04T00:22:08-08:00

Commit Message:
DREAMWEB: Change assert to warning in `showAllEx`

Trac #15436

Changed paths:
    engines/dreamweb/backdrop.cpp


diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index d76a7ee40ec..9393904a719 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -267,7 +267,14 @@ void DreamWebEngine::showAllEx() {
 		uint16 currentFrame = 3 * i;
 		calcFrFrame(frameBase._frames[currentFrame], &width, &height, x, y, &objPos);
 		if ((width != 0) || (height != 0)) {
-			assert(currentFrame < 256);
+			// FIXME: this was an assert() that failed during normal gameplay.
+			// Now it's a warning, because it's unclear if the check is valid.
+			// It could have been a copy/paste mistake from showAllFree,
+			// where there are fewer iterations. See bugs: #15420, #15436
+			if (currentFrame >= 256) {
+				warning("showing extra frame %d >= 256", currentFrame);
+			}
+
 			showFrame(frameBase, x + _mapAdX, y + _mapAdY, currentFrame, 0);
 			objPos.index = i;
 			_exList.push_back(objPos);