xrGame/Inventory.h|cpp: moved CInventorySlot functions to the header

OpenXRay · Dec 14, 2022 · d0c0f2d · d0c0f2d
1 parent 588feb3
commit d0c0f2d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 17 deletions.
diff --git a/src/xrGame/Inventory.cpp b/src/xrGame/Inventory.cpp
@@ -48,15 +48,6 @@ bool defaultSlotActiveness[] =
     false // helmet
 };
 
-CInventorySlot::CInventorySlot()
-{
-    m_pIItem = NULL;
-    m_bAct = true;
-    m_bPersistent = false;
-}
-
-CInventorySlot::~CInventorySlot() {}
-bool CInventorySlot::CanBeActivated() const { return (m_bAct); };
 CInventory::CInventory()
 {
     m_fMaxWeight = pSettings->r_float("inventory", "max_weight");

diff --git a/src/xrGame/Inventory.h b/src/xrGame/Inventory.h
@@ -6,17 +6,14 @@ class CInventoryItem;
 class CHudItem;
 class CInventoryOwner;
 
-class CInventorySlot
+class CInventorySlot final
 {
 public:
-    CInventorySlot();
-    virtual ~CInventorySlot();
+    bool CanBeActivated() const { return m_bAct; }
 
-    bool CanBeActivated() const;
-
-    PIItem m_pIItem;
-    bool m_bPersistent;
-    bool m_bAct;
+    PIItem m_pIItem     = nullptr;
+    bool m_bPersistent  = false;
+    bool m_bAct         = true;
 };
 
 class priority_group