Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

We don't have light_sap_recharge.sitem, so remove it

Browse Source
ryzomclassic-develop
kaetemi 5 years ago
parent 6d5eb14d4f
commit 71c7e31806
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File

6
code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp
Unescape Escape View File

@ -2590,7 +2590,6 @@ void CCharacter::enchantOrRechargeItem(INVENTORIES::TInventory invId, uint32 slo
{ {
static const CSheetId crystalSheetId("crystalized_spell.sitem"); static const CSheetId crystalSheetId("crystalized_spell.sitem");
static const CSheetId rechargeSheetId("item_sap_recharge.sitem"); static const CSheetId rechargeSheetId("item_sap_recharge.sitem");
static const CSheetId lightRechargeSheetId("light_sap_recharge.sitem");
if (!EnchantSystemEnabled) if (!EnchantSystemEnabled)
return; return;
@ -2610,7 +2609,7 @@ void CCharacter::enchantOrRechargeItem(INVENTORIES::TInventory invId, uint32 slo
{ {
enchantItem(invId, slot); enchantItem(invId, slot);
} }
else if ((item->getSheetId() == rechargeSheetId) || (item->getSheetId() == lightRechargeSheetId)) else if (item->getSheetId() == rechargeSheetId)
{ {
rechargeItem(invId, slot); rechargeItem(invId, slot);
} }
@ -2624,7 +2623,6 @@ bool CCharacter::checkSlotsForEnchantOrRecharge(INVENTORIES::TInventory invId, u
{ {
static const CSheetId crystalSheetId("crystalized_spell.sitem"); static const CSheetId crystalSheetId("crystalized_spell.sitem");
static const CSheetId rechargeSheetId("item_sap_recharge.sitem"); static const CSheetId rechargeSheetId("item_sap_recharge.sitem");
static const CSheetId lightRechargeSheetId("light_sap_recharge.sitem");
if (!EnchantSystemEnabled) if (!EnchantSystemEnabled)
return false; return false;
@ -2668,7 +2666,7 @@ bool CCharacter::checkSlotsForEnchantOrRecharge(INVENTORIES::TInventory invId, u
else else
{ {
// check if the item is a recharge // 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); SM_STATIC_PARAMS_1(params, STRING_MANAGER::item);
params[0].SheetId = item->getSheetId(); params[0].SheetId = item->getSheetId();

Write Preview
Loading…
Cancel
Save