[Scummvm-git-logs] scummvm master -> 41ed2ebf6afeb50cb15b4323d61fc5157d8fadce

[sev-]

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:
41ed2ebf6a SCUMM: Fix compilation with disabled HE subengine


Commit: 41ed2ebf6afeb50cb15b4323d61fc5157d8fadce
    https://github.com/scummvm/scummvm/commit/41ed2ebf6afeb50cb15b4323d61fc5157d8fadce
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-06-11T15:55:02+02:00

Commit Message:
SCUMM: Fix compilation with disabled HE subengine

Changed paths:
    engines/scumm/actor.cpp


diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 2b27a3c97a7..99f59b1c236 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -2242,8 +2242,10 @@ Actor *ScummEngine::derefActorSafe(int id, const char *errmsg) const {
 void ScummEngine::processActors() {
 	int numactors = 0;
 
+#ifdef ENABLE_HE
 	if (_game.heversion >= 71 && ((ScummEngine_v71he *)this)->_disableActorDrawingFlag)
 		return;
+#endif
 
 	// Make a list of all actors in this room
 	for (int i = 1; i < _numActors; i++) {
@@ -3017,7 +3019,7 @@ void ScummEngine_v70he::resetActorBgs() {
 			// 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;
 
@@ -3042,10 +3044,14 @@ void ScummEngine_v70he::resetActorBgs() {
 			}
 
 			if (actorMin != 0x7fffffff && _actors[j]->_needBgReset) {
+#ifdef ENABLE_HE
 				bool disableDrawing = _game.heversion >= 71 && (((ScummEngine_v71he *)this)->_disableActorDrawingFlag);
+#else
+				bool disableDrawing = false;
+#endif
 				if ((actorMax - actorMin) > 0 && !disableDrawing)
 					_gdi->resetBackground(actorMin, actorMax, i);
-			}		
+			}
 		}
 	}
 
@@ -3054,6 +3060,7 @@ void ScummEngine_v70he::resetActorBgs() {
 	}
 }
 
+#ifdef ENABLE_HE
 bool ScummEngine_v95he::prepareForActorErase() {
 	for (int i = 1; i < _numActors; i++) {
 		if (((ActorHE *)_actors[i])->_generalFlags & ACTOR_GENERAL_FLAG_IGNORE_ERASE) {
@@ -3129,6 +3136,7 @@ void ScummEngine_v95he::resetActorBgs() {
 		_actors[i]->_needBgReset = false;
 	}
 }
+#endif
 
 #undef ACTOR_CONTIGUOUS_WITH_STRIP