From e9feca648a87588c050486f69b3ab0e025a1d044 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Tue, 10 Nov 2020 17:10:50 +0800 Subject: [PATCH] Fix wrong time type --- .../entities_game_service/game_item_manager/game_item.cpp | 4 ++-- .../src/entities_game_service/game_item_manager/game_item.h | 6 +++--- 2 files changed, 5 insertions(+), 5 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 8f1d6b432..785b50ffb 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 @@ -1085,7 +1085,7 @@ void CGameItem::resetEnchantment() _SapLoad = 0; _Enchantment.clear(); contReset( _Enchantment ); - _LatencyEndDate = 0.0; + _LatencyEndDate = 0; if (getInventory() != NULL) getInventory()->onItemChanged(getInventorySlot(), INVENTORIES::TItemChangeFlags(INVENTORIES::itc_enchant)); @@ -1350,7 +1350,7 @@ void CGameItem::clear() _Destroyable = true; _Dropable = true; // _SlotImage = 0xFFFF; - _LatencyEndDate = 0.0; + _LatencyEndDate = 0; // _Parent = NULL; _Inventory = NULL; _InventorySlot = INVENTORIES::INVALID_INVENTORY_SLOT; 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 79c44d31e..c7dcbe521 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 @@ -651,9 +651,9 @@ public : bool getStats(const std::string &stats, std::string &final ); /// accessors to the action latency end date - inline double getLatencyEndDate(){ return _LatencyEndDate; } + inline NLMISC::TGameCycle getLatencyEndDate(){ return _LatencyEndDate; } - inline void setLatencyEndDate( double latencyEndDate ){ _LatencyEndDate = latencyEndDate; } + inline void setLatencyEndDate( NLMISC::TGameCycle latencyEndDate ){ _LatencyEndDate = latencyEndDate; } /// set the max sap load craft parameter inline void setMaxSapLoad(float value) @@ -946,7 +946,7 @@ private: /// string associated with this item std::string _PhraseId; /// tick when the proc will be available again - double _LatencyEndDate; + NLMISC::TGameCycle _LatencyEndDate; /// image of the item in bag / equipment // uint16 _SlotImage; NLMISC::TGameCycle _TotalSaleCycle;