Merge pull request #2481 from stellargames/t5936-allow_items_to_handl…

…e_use_themselves_always Always allow custom items to handle UseItem themselves.
Interkarma · Jan 17, 2023 · 53a682d · 53a682d
2 parents c3a78a1 + e7f059e
commit 53a682d
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Assets/Scripts/Game/UserInterfaceWindows/DaggerfallInventoryWindow.cs b/Assets/Scripts/Game/UserInterfaceWindows/DaggerfallInventoryWindow.cs
@@ -1657,6 +1657,10 @@ Item GetQuestItem(DaggerfallUnityItem item)
         // This will need more work as more usable items are available
         protected void UseItem(DaggerfallUnityItem item, ItemCollection collection = null)
         {
+            // Allow item to handle its own use.
+            if (item.UseItem(collection))
+                return;
+
             const int noSpellsTextId = 12;
 
             // Handle quest items on use clicks
@@ -1977,9 +1981,7 @@ protected virtual void LocalItemListScroller_OnItemClick(DaggerfallUnityItem ite
             }
             else if (actionMode == ActionModes.Use)
             {
-                // Allow item to handle its own use, fall through to general use function if unhandled
-                if (!item.UseItem(localItems))
-                    UseItem(item, localItems);
+                UseItem(item, localItems);
                 Refresh(false);
             }
             else if (actionMode == ActionModes.Remove)
@@ -2041,9 +2043,7 @@ protected virtual void RemoteItemListScroller_OnItemClick(DaggerfallUnityItem it
             }
             else if (actionMode == ActionModes.Use)
             {
-                // Allow item to handle its own use, fall through to general use function if unhandled
-                if (!item.UseItem(remoteItems))
-                    UseItem(item, remoteItems);
+                UseItem(item, remoteItems);
                 Refresh(false);
             }
             else if (actionMode == ActionModes.Remove)