Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-09-05 14:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove backward compatibility for FindBehaviorSlot method

Browse Source 
Co-authored-by: aronwk-aaron <26027722+aronwk-aaron@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2025-09-02 21:23:59 +00:00
parent 1e04ff1a9e
commit f98f7f6545
3 changed files with 0 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
dGame/dComponents/InventoryComponent.cpp
View File

@@ -1315,23 +1315,6 @@ void InventoryComponent::RemoveDatabasePet(LWOOBJID id) {
m_Pets.erase(id); m_Pets.erase(id);
} }
BehaviorSlot InventoryComponent::FindBehaviorSlot(const eItemType type) {
switch (type) {
case eItemType::HAT:
return BehaviorSlot::Head;
case eItemType::NECK:
return BehaviorSlot::Neck;
case eItemType::LEFT_HAND:
return BehaviorSlot::Offhand;
case eItemType::RIGHT_HAND:
return BehaviorSlot::Primary;
case eItemType::CONSUMABLE:
return BehaviorSlot::Consumable;
default:
return BehaviorSlot::Invalid;
}
}
BehaviorSlot InventoryComponent::FindBehaviorSlotByEquipLocation(const std::string& equipLocation) { BehaviorSlot InventoryComponent::FindBehaviorSlotByEquipLocation(const std::string& equipLocation) {
if (equipLocation == "special_r") { if (equipLocation == "special_r") {
return BehaviorSlot::Primary; return BehaviorSlot::Primary;

7
dGame/dComponents/InventoryComponent.h
View File

@@ -361,13 +361,6 @@ public:
*/ */
void RemoveDatabasePet(LWOOBJID id); void RemoveDatabasePet(LWOOBJID id);
/**
* Returns the current behavior slot active for the passed item type
* @param type the item type to find the behavior slot for
* @return the current behavior slot active for the passed item type
*/
static BehaviorSlot FindBehaviorSlot(eItemType type);
/** /**
* Returns the behavior slot for the given equipment location * Returns the behavior slot for the given equipment location
* @param equipLocation the equipment location to find the behavior slot for * @param equipLocation the equipment location to find the behavior slot for

13
tests/dGameTests/dComponentsTests/InventoryComponentTests.cpp
View File

@@ -4,7 +4,6 @@
#include "InventoryComponent.h" #include "InventoryComponent.h"
#include "BehaviorSlot.h" #include "BehaviorSlot.h"
#include "Entity.h" #include "Entity.h"
#include "eItemType.h"
class InventoryComponentTest : public GameDependenciesTest { class InventoryComponentTest : public GameDependenciesTest {
protected: protected:
@@ -33,15 +32,3 @@ TEST_F(InventoryComponentTest, FindBehaviorSlotByEquipLocationTest) {
EXPECT_EQ(InventoryComponent::FindBehaviorSlotByEquipLocation("root"), BehaviorSlot::Invalid); EXPECT_EQ(InventoryComponent::FindBehaviorSlotByEquipLocation("root"), BehaviorSlot::Invalid);
EXPECT_EQ(InventoryComponent::FindBehaviorSlotByEquipLocation("leftHand"), BehaviorSlot::Invalid); EXPECT_EQ(InventoryComponent::FindBehaviorSlotByEquipLocation("leftHand"), BehaviorSlot::Invalid);
} }
/**
* Test that the original FindBehaviorSlot by itemType still works correctly
*/
TEST_F(InventoryComponentTest, FindBehaviorSlotByItemTypeTest) {
// Test that the original method still works for backward compatibility scenarios
EXPECT_EQ(InventoryComponent::FindBehaviorSlot(eItemType::HAT), BehaviorSlot::Head);
EXPECT_EQ(InventoryComponent::FindBehaviorSlot(eItemType::NECK), BehaviorSlot::Neck);
EXPECT_EQ(InventoryComponent::FindBehaviorSlot(eItemType::LEFT_HAND), BehaviorSlot::Offhand);
EXPECT_EQ(InventoryComponent::FindBehaviorSlot(eItemType::RIGHT_HAND), BehaviorSlot::Primary);
EXPECT_EQ(InventoryComponent::FindBehaviorSlot(eItemType::CONSUMABLE), BehaviorSlot::Consumable);
}