Check if lastActiveMunition is dangled

Franisz · Jan 1, 2024 · 55c1b01 · 55c1b01
1 parent f807388
commit 55c1b01
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/zUtilities/Inventory.cpp b/zUtilities/Inventory.cpp
@@ -35,6 +35,14 @@ namespace GOTHIC_ENGINE {
     if ( !Options::ActivateUsedMunition )
       return;
 
+    if (lastActiveMunition) {
+        if (player->inventory2.IsIn(lastActiveMunition, 1) == nullptr
+            && player->GetLeftHand() != lastActiveMunition
+            && player->GetRightHand() != lastActiveMunition) {
+            lastActiveMunition = nullptr;
+        }
+    }
+
     if ( playerStatus.traderNpc ) {
       HandleMunition( nullptr );
       return;