Ability to unload all weapons in inventory via context menu. (#459)

OpenXRay · Sep 5, 2019 · 455781b · 455781b
1 parent c7d2e67
commit 455781b
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 0 deletions.
diff --git a/res/gamedata/configs/text/eng/openxray.xml b/res/gamedata/configs/text/eng/openxray.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="windows-1251" ?>
 <string_table>
+	<string id="st_unload_magazine_all">
+		<text>unload all weapons</text>
+	</string>
 	<string id="st_unequip">
 		<text>unequip</text>
 	</string>

diff --git a/res/gamedata/configs/text/pol/openxray.xml b/res/gamedata/configs/text/pol/openxray.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="windows-1251" ?>
 <string_table>
+	<string id="st_unload_magazine_all">
+		<text>roz豉duj wszystkie bronie</text>
+	</string>
 	<string id="st_unequip">
 		<text>Zdejmij</text>
 	</string>

diff --git a/res/gamedata/configs/text/rus/openxray.xml b/res/gamedata/configs/text/rus/openxray.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="windows-1251" ?>
 <string_table>
+	<string id="st_unload_magazine_all">
+		<text>ðàçðÿäèòü âñ¸ îðóæèå</text>
+	</string>
 	<string id="st_unequip">
 		<text>óáðàòü â ðþêçàê</text>
 	</string>

diff --git a/src/xrGame/ui/UIActorMenuInventory.cpp b/src/xrGame/ui/UIActorMenuInventory.cpp
@@ -1029,6 +1029,7 @@ void CUIActorMenu::PropertiesBoxForWeapon(CUICellItem* cell_item, PIItem item, b
         if (b)
         {
             m_UIPropertiesBox->AddItem("st_unload_magazine", NULL, INVENTORY_UNLOAD_MAGAZINE);
+            m_UIPropertiesBox->AddItem("st_unload_magazine_all", NULL, INVENTORY_UNLOAD_MAGAZINE_ALL);
             b_show = true;
         }
     }
@@ -1413,6 +1414,30 @@ void CUIActorMenu::ProcessPropertiesBoxClicked(CUIWindow* w, void* d)
         }
         break;
     }
+    case INVENTORY_UNLOAD_MAGAZINE_ALL:
+    {
+        u32 const ci_count = m_pInventoryBagList->ItemsCount();
+        for (u32 i = 0; i < ci_count; ++i)
+        {
+            CUICellItem* ci = m_pInventoryBagList->GetItemIdx(i);
+            VERIFY(ci);
+            CWeaponMagazined* weap_mag = smart_cast<CWeaponMagazined*>((CWeapon*)ci->m_pData);
+            if (weap_mag)
+            {
+                weap_mag->UnloadMagazine();
+                for (u32 i = 0; i < ci->ChildsCount(); ++i)
+                {
+                    CUICellItem* child_itm = ci->Child(i);
+                    CWeaponMagazined* child_weap_mag = smart_cast<CWeaponMagazined*>((CWeapon*)child_itm->m_pData);
+                    if (child_weap_mag)
+                    {
+                        child_weap_mag->UnloadMagazine();
+                    }
+                }
+            }
+        }
+        break;
+    }
     case INVENTORY_REPAIR:
     {
         TryRepairItem(this, 0);

diff --git a/src/xrUICore/UIMessages.h b/src/xrUICore/UIMessages.h
@@ -120,6 +120,7 @@ enum EUIMessages
 
     INVENTORY_RELOAD_MAGAZINE,
     INVENTORY_UNLOAD_MAGAZINE,
+    INVENTORY_UNLOAD_MAGAZINE_ALL,
     INVENTORY_SELL_ITEM,
 
     // CUIAnimationBase