[Scummvm-git-logs] scummvm master -> 7517aa58b967594785ca9b9ae8a54e85d4e6c5ed

[AndywinXp]

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:
7517aa58b9 SCUMM: HE: Fix actors with no costume resetting the background


Commit: 7517aa58b967594785ca9b9ae8a54e85d4e6c5ed
    https://github.com/scummvm/scummvm/commit/7517aa58b967594785ca9b9ae8a54e85d4e6c5ed
Author: AndywinXp (andywinxp at gmail.com)
Date: 2024-06-25T22:06:00+02:00

Commit Message:
SCUMM: HE: Fix actors with no costume resetting the background

Welcome to another episode of:
"I didn't think I actually needed those lines of code".

Fixes some actors being cut off on Baseball2001 and 2003.

Changed paths:
    engines/scumm/actor.cpp


diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 6163a4f3d18..c51210afa99 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -3018,12 +3018,8 @@ void ScummEngine_v70he::resetActorBgs() {
 			if (!testGfxAnyUsageBits(strip))
 				break;
 
-			// The original also does this test, which
-			// apparently breaks a bunch of other stuff though,
-			// and doesn't help us in any way...
-			//
-			// if (!testGfxOtherUsageBits(strip, j))
-			//	continue;
+			if (!testGfxUsageBit(strip, j))
+				continue;
 
 			int actorMin, actorMax;
 
@@ -3097,14 +3093,10 @@ void ScummEngine_v95he::resetActorBgs() {
 			if (!testGfxAnyUsageBits(strip))
 				break;
 
-			// The original also does this test, which
-			// apparently breaks a bunch of other stuff though,
-			// and doesn't help us in any way...
-			//
-			// if (!(testGfxOtherUsageBits(strip, act)))
-			// 	continue;
+			if (!testGfxUsageBit(strip, act))
+				continue;
 
-			if (!(_actors[act]->_needBgReset))
+			if (!_actors[act]->_needBgReset)
 				continue;
 
 			lastStrip = i;