From a2c7c4dc25cecaa6148a870f28e75f3794038581 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Tue, 10 Nov 2020 13:53:42 +0800 Subject: [PATCH] Remove unused faction string from item --- .../entities_game_service/game_item_manager/game_item.cpp | 2 -- .../src/entities_game_service/game_item_manager/game_item.h | 6 ------ .../player_manager/persistent_player_data.cpp | 1 - 3 files changed, 9 deletions(-) diff --git a/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp b/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp index 22e204120..8f1d6b432 100644 --- a/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp +++ b/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp @@ -1205,7 +1205,6 @@ CGameItemPtr CGameItem::getItemCopy() item->_SapLoad = _SapLoad; item->_LostHPremains = 0.0f; item->_PhraseId = _PhraseId; - item->_RequiredFaction = _RequiredFaction; item->computeItemWornState(); log_Item_Create(item->getItemId(), item->getSheetId(), item->getStackSize(), item->quality()); @@ -1378,7 +1377,6 @@ void CGameItem::clear() _TypeSkillMods.clear(); _PhraseId.clear(); - _RequiredFaction.clear(); _CustomText.clear(); } diff --git a/ryzom/server/src/entities_game_service/game_item_manager/game_item.h b/ryzom/server/src/entities_game_service/game_item_manager/game_item.h index 1c1d90df8..28cbfed5f 100644 --- a/ryzom/server/src/entities_game_service/game_item_manager/game_item.h +++ b/ryzom/server/src/entities_game_service/game_item_manager/game_item.h @@ -680,11 +680,6 @@ public : /// set required skill level inline void setRequiredSkillLevel2( uint16 l ) { _RequiredSkillLevel2 = l; } - /// get Required Faction - inline const std::string & getRequiredFaction() const { return _RequiredFaction;} - /// set Required Faction - inline void setRequiredFaction(const std::string & str){ _RequiredFaction = str;} - inline bool getLockedByOwner() const { return _LockedByOwner; } void setLockedByOwner(bool value); @@ -957,7 +952,6 @@ private: // required skill bool _UseNewSystemRequirement; - std::string _RequiredFaction; SKILLS::ESkills _RequiredSkill; uint16 _RequiredSkillLevel; SKILLS::ESkills _RequiredSkill2; diff --git a/ryzom/server/src/entities_game_service/player_manager/persistent_player_data.cpp b/ryzom/server/src/entities_game_service/player_manager/persistent_player_data.cpp index 774c2be58..5ad67632e 100644 --- a/ryzom/server/src/entities_game_service/player_manager/persistent_player_data.cpp +++ b/ryzom/server/src/entities_game_service/player_manager/persistent_player_data.cpp @@ -1340,7 +1340,6 @@ private: PROP2(_Recommended, uint32, _Recommended, _Recommended=val)\ PROP2(_CreatorId, CEntityId, _CreatorId, _CreatorId=val)\ PROP2(_PhraseId, string, _PhraseId, _PhraseId=val)\ - PROP2(_RequiredFaction, string, _RequiredFaction, _RequiredFaction=val)\ LSTRUCT2(_CraftParameters, if (_CraftParameters != NULL), _CraftParameters->store(pdr), _CraftParameters = new CItemCraftParameters; _CraftParameters->apply(pdr))\ LPROP2(_SlotImage, uint16, if (0), 0xffff, slotImage=val)\ LPROP2(_SapLoad, uint32, if (_SapLoad!=0), _SapLoad, _SapLoad=val)\