[Scummvm-git-logs] scummvm master -> 863299791cbfff2a6efbb3966933ef946be3b641

[alexbevi]

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:
863299791c ASYLUM: Fix checkObject crash with kDebugLevelObjects debugging


Commit: 863299791cbfff2a6efbb3966933ef946be3b641
    https://github.com/scummvm/scummvm/commit/863299791cbfff2a6efbb3966933ef946be3b641
Author: Alex Bevilacqua (alex at alexbevi.com)
Date: 2026-09-02T06:14:13-04:00

Commit Message:
ASYLUM: Fix checkObject crash with kDebugLevelObjects debugging

Changed paths:
    engines/asylum/resources/special.cpp


diff --git a/engines/asylum/resources/special.cpp b/engines/asylum/resources/special.cpp
index bd4048a6d20..218f77cbe2a 100644
--- a/engines/asylum/resources/special.cpp
+++ b/engines/asylum/resources/special.cpp
@@ -1975,7 +1975,7 @@ uint32 Special::getCounter(ActorIndex index) const {
 
 void Special::checkObject(Object *object, GameFlag flagToSet, GameFlag flagToClear, ObjectId objectId) {
 	if (object->getFrameIndex() == 15) {
-		Object *otherObject = getWorld()->getObjectById(objectId);
+		Object *otherObject = objectId == kObjectNone ? object : getWorld()->getObjectById(objectId);
 		debugC(kDebugLevelObjects, "[checkObject] %s -> %s (flags: set %d, clear %d)",
 				object->getName(), otherObject->getName(), flagToSet, flagToClear);