From 2a37a76cb50be13c924b23d01627ae06a0defed3 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Wed, 11 Nov 2020 07:31:07 +0800 Subject: [PATCH] Remove old ClientInventoryPosition property --- .../entities_game_service/game_item_manager/game_item.cpp | 1 - .../src/entities_game_service/game_item_manager/game_item.h | 6 ------ .../player_manager/persistent_player_data.cpp | 1 - 3 files changed, 8 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 785b50ffb..55a3eb4fd 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 @@ -1355,7 +1355,6 @@ void CGameItem::clear() _Inventory = NULL; _InventorySlot = INVENTORIES::INVALID_INVENTORY_SLOT; _Form = NULL; - _ClientInventoryPosition = -1; _HP = 0; _CurrentWornState = ITEM_WORN_STATE::Unspoiled; _LostHPremains = 0.0f; 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 bcf9d61c5..20334bea9 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 @@ -632,12 +632,6 @@ public : */ void dumpGameItemStats( const std::string& fileName =""); - /// set the client inventory position - inline void setClientInventoryPosition(sint16 pos) { _ClientInventoryPosition = pos; } - - /// get the client inventory position - inline sint16 getClientInventoryPosition() const { return _ClientInventoryPosition; } - /// get Vector of CSheetId used for craft item // const std::vector< NLMISC::CSheetId >& getRmUsedForCraft() const { return _RmUsedForCraft; } 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 e217089c1..7753c4dec 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 @@ -1341,7 +1341,6 @@ private: PROP2(_SheetId, CSheetId, _SheetId, _SheetId=val)\ /* PROP2(_LocSlot, uint32, _InventorySlot, _InventorySlot=val)*/\ PROP2(_LocSlot, uint32, _InventorySlot, applyArgs.InventorySlot=val)\ - /*PROP2(_ClientInventoryPosition, sint16, _ClientInventoryPosition, _ClientInventoryPosition=val)*/\ PROP2(_HP, uint32, _HP, _HP=val)\ PROP2(_Recommended, uint32, _Recommended, _Recommended=val)\ PROP2(_CreatorId, CEntityId, _CreatorId, _CreatorId=val)\