From 71c7e31806ff32063646a5258006acdd15835e4e Mon Sep 17 00:00:00 2001 From: kaetemi Date: Mon, 18 Nov 2019 07:35:28 +0800 Subject: [PATCH] We don't have light_sap_recharge.sitem, so remove it --- .../player_manager/character_inventory_manipulation.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp b/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp index 3b2819df2..db2363817 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp +++ b/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp @@ -2590,7 +2590,6 @@ void CCharacter::enchantOrRechargeItem(INVENTORIES::TInventory invId, uint32 slo { static const CSheetId crystalSheetId("crystalized_spell.sitem"); static const CSheetId rechargeSheetId("item_sap_recharge.sitem"); - static const CSheetId lightRechargeSheetId("light_sap_recharge.sitem"); if (!EnchantSystemEnabled) return; @@ -2610,7 +2609,7 @@ void CCharacter::enchantOrRechargeItem(INVENTORIES::TInventory invId, uint32 slo { enchantItem(invId, slot); } - else if ((item->getSheetId() == rechargeSheetId) || (item->getSheetId() == lightRechargeSheetId)) + else if (item->getSheetId() == rechargeSheetId) { rechargeItem(invId, slot); } @@ -2624,7 +2623,6 @@ bool CCharacter::checkSlotsForEnchantOrRecharge(INVENTORIES::TInventory invId, u { static const CSheetId crystalSheetId("crystalized_spell.sitem"); static const CSheetId rechargeSheetId("item_sap_recharge.sitem"); - static const CSheetId lightRechargeSheetId("light_sap_recharge.sitem"); if (!EnchantSystemEnabled) return false; @@ -2668,7 +2666,7 @@ bool CCharacter::checkSlotsForEnchantOrRecharge(INVENTORIES::TInventory invId, u else { // check if the item is a recharge - if ((item->getSheetId() != rechargeSheetId) && (item->getSheetId() != lightRechargeSheetId)) + if (item->getSheetId() != rechargeSheetId) { SM_STATIC_PARAMS_1(params, STRING_MANAGER::item); params[0].SheetId = item->getSheetId();