[Scummvm-git-logs] scummvm master -> 37b8dcae2beeb10af693617009039446e7cbb3d1
bluegr
noreply at scummvm.org
Tue May 5 16:39:32 UTC 2026
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:
37b8dcae2b NANCY: Fix inventory check in early games
Commit: 37b8dcae2beeb10af693617009039446e7cbb3d1
https://github.com/scummvm/scummvm/commit/37b8dcae2beeb10af693617009039446e7cbb3d1
Author: tunnelsociety (tunnelsociety at mm.st)
Date: 2026-05-05T19:39:28+03:00
Commit Message:
NANCY: Fix inventory check in early games
hasItem() returns Nancy engine's _true and _false, which might
not be `true` and `false`.
Fix #16761
Changed paths:
engines/nancy/action/actionmanager.cpp
diff --git a/engines/nancy/action/actionmanager.cpp b/engines/nancy/action/actionmanager.cpp
index 83d6858fdef..769d610b087 100644
--- a/engines/nancy/action/actionmanager.cpp
+++ b/engines/nancy/action/actionmanager.cpp
@@ -338,12 +338,7 @@ void ActionManager::processDependency(DependencyRecord &dep, ActionRecord &recor
dep.satisfied = true;
break;
case DependencyType::kInventory:
- if (dep.condition == g_nancy->_false) {
- // Item not in possession or held
- dep.satisfied = !NancySceneState.hasItem(dep.label);
- } else {
- dep.satisfied = NancySceneState.hasItem(dep.label);
- }
+ dep.satisfied = NancySceneState.hasItem(dep.label) == dep.condition;
break;
case DependencyType::kEvent:
More information about the Scummvm-git-logs
mailing list