Remove unused custom name, item name is specified already by _PhraseId

ryzomclassic-develop
kaetemi 4 years ago
parent a2c7c4dc25
commit aa2574e10a

@ -719,9 +719,10 @@ public :
uint8 getPetIndex() const { return _PetIndex; } uint8 getPetIndex() const { return _PetIndex; }
void setPetIndex(uint8 val) { _PetIndex = val; } void setPetIndex(uint8 val) { _PetIndex = val; }
#ifdef RYZOM_FORGE_PET_NAME
ucstring getCustomName() const { return _CustomName; } ucstring getCustomName() const { return _CustomName; }
void setCustomName(ucstring val) { _CustomName = val; } void setCustomName(ucstring val) { _CustomName = val; }
#endif
protected: protected:
friend class CFaberPhrase; friend class CFaberPhrase;
@ -968,7 +969,9 @@ private:
bool _UnMovable; bool _UnMovable;
bool _Movable; bool _Movable;
uint8 _PetIndex; uint8 _PetIndex;
#ifdef RYZOM_FORGE_PET_NAME
ucstring _CustomName; ucstring _CustomName;
#endif
}; };
/** /**

@ -1329,6 +1329,12 @@ private:
}\ }\
postApply((INVENTORIES::TInventory) RefInventoryId, applyArgs.Owner);\ postApply((INVENTORIES::TInventory) RefInventoryId, applyArgs.Owner);\
#ifdef RYZOM_FORGE_PET_NAME
#define PD_CUSTOM_NAME_PROP2() PROP2(_CustomName, ucstring, _CustomName, _CustomName=val)
#else
#define PD_CUSTOM_NAME_PROP2()
#endif
#define PERSISTENT_DATA\ #define PERSISTENT_DATA\
FLAG0(CLEAR,clear())\ FLAG0(CLEAR,clear())\
PROP2(_ItemId, uint64, _ItemId.getRawId(), _ItemId = INVENTORIES::TItemId(val))\ PROP2(_ItemId, uint64, _ItemId.getRawId(), _ItemId = INVENTORIES::TItemId(val))\
@ -1358,7 +1364,7 @@ private:
STRUCT_VECT(_TypeSkillMods)\ STRUCT_VECT(_TypeSkillMods)\
LPROP_VECT(CSheetId, _Enchantment, VECT_LOGIC(_Enchantment) if (_Enchantment[i]!=CSheetId::Unknown))\ LPROP_VECT(CSheetId, _Enchantment, VECT_LOGIC(_Enchantment) if (_Enchantment[i]!=CSheetId::Unknown))\
PROP2(_CustomText, ucstring, _CustomText, _CustomText=val)\ PROP2(_CustomText, ucstring, _CustomText, _CustomText=val)\
PROP2(_CustomName, ucstring, _CustomName, _CustomName=val)\ PD_CUSTOM_NAME_PROP2()\
PROP(bool, _Movable)\ PROP(bool, _Movable)\
PROP(bool, _UnMovable)\ PROP(bool, _UnMovable)\
PROP(bool, _LockedByOwner)\ PROP(bool, _LockedByOwner)\

Loading…
Cancel
Save