Merge branch 'development' into cf/468-add-proper-semantic-version-comparison-to-check-mod-compatibility

Author: traunts

CHANGELOG.md

@@ -313,6 +313,12 @@ This can be accessed via the new Lua (R/W) `SettingsMan` property `AIUpdateInter
 - Added `ACrab` INI properties for setting individual foot `AtomGroup`s, as opposed to setting the same foot `AtomGroup`s for both `Legs` on the left or right side.  
 	These are `LeftFGFootGroup`, `LeftBGFootGroup`, `RightFGFootGroup` and `RightBGFootGroup`.
 
+- Added alternative `Actor` Lua function `RemoveInventoryItem(moduleName, presetName)`, that lets you specify the module and preset name of the inventory item, instead of just the preset name.
+
+- Added alternative `AHuman` Lua function `EquipNamedDevice(moduleName, presetName, doEquip)`, that lets you specify the module and preset name of the `HeldDevice` to equip, instead of just the preset name.
+
+- Added Lua access (R/W) to `Attachable` property `DeleteWhenRemovedFromParent`, which determines whether the given `Attachable` should delete itself when it's removed from its current parent.
+
 </details>
 
 <details><summary><b>Changed</b></summary>
@@ -478,6 +484,8 @@ As such, the `Index.ini` property `SupportedGameVersion` must now be a valid sem
 
 - Fix advanced performance stats (graphs) peak values stuck at 0.
 
+- Fixed `Entity.ModuleName` returning and empty string for `Entities` defined in Base.rte. They now return "Base.rte", as they should.
+
 </details>
 
 <details><summary><b>Removed</b></summary>

Entities/AHuman.cpp

@@ -1002,7 +1002,7 @@ bool AHuman::EquipLoadedFirearmInGroup(std::string group, std::string excludeGro
 //                  of with the specified preset name in the inventory. If the held device already 
 //                  is of that preset name, or no device is in inventory, nothing happens.
 
-bool AHuman::EquipNamedDevice(const std::string name, bool doEquip)
+bool AHuman::EquipNamedDevice(const std::string &moduleName, const std::string &presetName, bool doEquip)
 {
     if (!(m_pFGArm && m_pFGArm->IsAttached()))
         return false;
@@ -1013,7 +1013,7 @@ bool AHuman::EquipNamedDevice(const std::string name, bool doEquip)
     if (m_pFGArm->HoldsSomething())
     {
         pDevice = dynamic_cast<HeldDevice *>(m_pFGArm->GetHeldMO());
-        if (pDevice && pDevice->GetPresetName() == name)
+        if (pDevice && (moduleName.empty() || pDevice->GetModuleName() == moduleName) && pDevice->GetPresetName() == presetName)
             return true;
     }
 
@@ -1022,7 +1022,7 @@ bool AHuman::EquipNamedDevice(const std::string name, bool doEquip)
     {
         pDevice = dynamic_cast<HeldDevice *>(*itr);
         // Found proper device to equip, so make the switch!
-        if (pDevice && pDevice->GetPresetName() == name)
+        if (pDevice && (moduleName.empty() || pDevice->GetModuleName() == moduleName) && pDevice->GetPresetName() == presetName)
         {
             if (doEquip)
             {

Entities/AHuman.h

@@ -462,19 +462,24 @@ DefaultPieMenuNameGetter("Default Human Pie Menu");
 
     bool EquipLoadedFirearmInGroup(std::string group, std::string exludeGroup, bool doEquip = true);
 
+	/// <summary>
+	/// Switches the equipped HeldDevice (if any) to the first found device with the specified preset name in the inventory.
+	/// If the equipped HeldDevice is of that module and preset name, nothing happens.
+	/// </summary>
+	/// <param name="presetName">The preset name of the HeldDevice to equip.</param>
+	/// <param name="doEquip">Whether to actually equip any matching item found in the inventory, or just report whether or not it's there.</param>
+	/// <returns>Whether a matching HeldDevice was successfully found/switched -o, or already held.</returns>
+	bool EquipNamedDevice(const std::string &presetName, bool doEquip) { return EquipNamedDevice("", presetName, doEquip); }
 
-//////////////////////////////////////////////////////////////////////////////////////////
-// Virtual Method:  EquipNamedDevice
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Switches the currently held device (if any) to the first found device
-//                  of with the specified preset name in the inventory. If the held device already
-//                  is of that preset name, or no device is in inventory, nothing happens.
-// Arguments:       The preset name the device must have.
-//                  Whether to actually equip any matching item found in the inventory,
-//                  or just report that it's there or not.
-// Return value:    Whether a device was successfully switched to, or already held.
-
-    bool EquipNamedDevice(const std::string name, bool doEquip);
+	/// <summary>
+	/// Switches the equipped HeldDevice (if any) to the first found device with the specified module and preset name in the inventory.
+	/// If the equipped HeldDevice is of that module and preset name, nothing happens.
+	/// </summary>
+	/// <param name="moduleName">The module name of the HeldDevice to equip.</param>
+	/// <param name="presetName">The preset name of the HeldDevice to equip.</param>
+	/// <param name="doEquip">Whether to actually equip any matching item found in the inventory, or just report whether or not it's there.</param>
+	/// <returns>Whether a matching HeldDevice was successfully found/switched -o, or already held.</returns>
+	bool EquipNamedDevice(const std::string &moduleName, const std::string &presetName, bool doEquip);
 
 
 //////////////////////////////////////////////////////////////////////////////////////////

Entities/Actor.cpp

@@ -762,28 +762,15 @@ MovableObject * Actor::SwapNextInventory(MovableObject *pSwapIn, bool muteSound)
     return pRetDev;
 }
 
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-//////////////////////////////////////////////////////////////////////////////////////////
-// Virtual Method:  RemoveInventoryItem
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:		Removes a specified item from the actor's inventory. Only one item is removed at a time.
-
-void Actor::RemoveInventoryItem(std::string presetName)
-{
-	if (!IsInventoryEmpty())
-	{
-		//while(HasObject(presetName))
-		//{
-			for (std::deque<MovableObject *>::iterator gItr = m_Inventory.begin(); gItr != m_Inventory.end(); ++gItr)
-			{
-				if ((*gItr) && (*gItr)->GetPresetName() == presetName)
-				{
-					delete (*gItr);
-					m_Inventory.erase(gItr);
-					break;
-				}
-			}
-		//}
+void Actor::RemoveInventoryItem(const std::string &moduleName, const std::string &presetName) {
+	for (std::deque<MovableObject*>::iterator inventoryIterator = m_Inventory.begin(); inventoryIterator != m_Inventory.end(); ++inventoryIterator) {
+		if ((moduleName.empty() || (*inventoryIterator)->GetModuleName() == moduleName) && (*inventoryIterator)->GetPresetName() == presetName) {
+			delete (*inventoryIterator);
+			m_Inventory.erase(inventoryIterator);
+			break;
+		}
 	}
 }
 

Entities/Actor.h

@@ -834,7 +834,14 @@ ClassInfoGetters;
 // Arguments:       Preset name of an item to remove.
 // Return value:    None.
 
-	void RemoveInventoryItem(std::string presetName);
+	void RemoveInventoryItem(const std::string &presetName) { RemoveInventoryItem("", presetName); }
+
+	/// <summary>
+	/// Removes the first inventory item with the given module name and preset name.
+	/// </summary>
+	/// <param name="moduleName">The module name of the item to remove.</param>
+	/// <param name="presetName">The preset name of the item to remove.</param>
+	void RemoveInventoryItem(const std::string &moduleName, const std::string &presetName);
 
     /// <summary>
     /// Removes and returns the inventory item at the given index. Ownership IS transferred.

Lua/LuaBindingsEntities.cpp

@@ -270,7 +270,8 @@ namespace RTE {
 		.def("RemoveMovePathBeginning", &Actor::RemoveMovePathBeginning)
 		.def("RemoveMovePathEnd", &Actor::RemoveMovePathEnd)
 		.def("AddInventoryItem", &Actor::AddInventoryItem, luabind::adopt(_2))
-		.def("RemoveInventoryItem", &Actor::RemoveInventoryItem)
+		.def("RemoveInventoryItem", (void (Actor::*)(const std::string &))&Actor::RemoveInventoryItem)
+		.def("RemoveInventoryItem", (void (Actor::*)(const std::string &, const std::string &))&Actor::RemoveInventoryItem)
 		.def("SwapNextInventory", &Actor::SwapNextInventory)
 		.def("SwapPrevInventory", &Actor::SwapPrevInventory)
 		.def("DropAllInventory", &Actor::DropAllInventory)
@@ -444,7 +445,8 @@ namespace RTE {
 		.def("EquipShield", &AHuman::EquipShield)
 		.def("EquipShieldInBGArm", &AHuman::EquipShieldInBGArm)
 		.def("EquipDeviceInGroup", &AHuman::EquipDeviceInGroup)
-		.def("EquipNamedDevice", &AHuman::EquipNamedDevice)
+		.def("EquipNamedDevice", (bool (AHuman::*)(const std::string &, bool))&AHuman::EquipNamedDevice)
+		.def("EquipNamedDevice", (bool (AHuman::*)(const std::string &, const std::string &, bool))&AHuman::EquipNamedDevice)
 		.def("EquipLoadedFirearmInGroup", &AHuman::EquipLoadedFirearmInGroup)
 		.def("UnequipFGArm", &AHuman::UnequipFGArm)
 		.def("UnequipBGArm", &AHuman::UnequipBGArm)
@@ -552,6 +554,7 @@ namespace RTE {
 		.property("JointStiffness", &Attachable::GetJointStiffness, &Attachable::SetJointStiffness)
 		.property("JointOffset", &Attachable::GetJointOffset, &Attachable::SetJointOffset)
 		.property("JointPos", &Attachable::GetJointPos)
+		.property("DeleteWhenRemovedFromParent", &Attachable::GetDeleteWhenRemovedFromParent, &Attachable::SetDeleteWhenRemovedFromParent)
 		.property("ApplyTransferredForcesAtOffset", &Attachable::GetApplyTransferredForcesAtOffset, &Attachable::SetApplyTransferredForcesAtOffset)
 		.property("BreakWound", &Attachable::GetBreakWound, &LuaAdaptersPropertyOwnershipSafetyFaker::AttachableSetBreakWound)
 		.property("ParentBreakWound", &Attachable::GetParentBreakWound, &LuaAdaptersPropertyOwnershipSafetyFaker::AttachableSetParentBreakWound)

System/Entity.cpp

@@ -152,7 +152,7 @@ namespace RTE {
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	std::string Entity::GetModuleName() const {
-		if (m_DefinedInModule > 0) {
+		if (m_DefinedInModule >= 0) {
 			if (const DataModule *dataModule = g_PresetMan.GetDataModule(m_DefinedInModule)) {
 				return dataModule->GetFileName();
 			}