From 90369deb5a870674ab02a26a93a71f06eafe9293 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sat, 20 Mar 2021 20:58:19 +0000 Subject: Change TimeOfDay to WorldDate (#5160) * Change TimeOfDay to WorldDate * Do not wrap at 20 minutes, continue incrementing * Fixes #4737 * Fixes #5159 --- src/Entities/Player.cpp | 2 +- src/Entities/Player.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Entities') diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index e431e4cc5..7d8c3a191 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -83,7 +83,7 @@ const int cPlayer::EATING_TICKS = 30; -cPlayer::cPlayer(const cClientHandlePtr & a_Client) : +cPlayer::cPlayer(const std::shared_ptr & a_Client) : Super(etPlayer, 0.6, 1.8), m_bVisible(true), m_FoodLevel(MAX_FOOD_LEVEL), diff --git a/src/Entities/Player.h b/src/Entities/Player.h index 86d4a2a07..2d31ef84b 100644 --- a/src/Entities/Player.h +++ b/src/Entities/Player.h @@ -47,7 +47,7 @@ public: CLASS_PROTODEF(cPlayer) - cPlayer(const cClientHandlePtr & a_Client); + cPlayer(const std::shared_ptr & a_Client); virtual ~cPlayer() override; // tolua_begin @@ -656,7 +656,7 @@ private: /** The item being dragged by the cursor while in a UI window */ cItem m_DraggingItem; - cClientHandlePtr m_ClientHandle; + std::shared_ptr m_ClientHandle; cSlotNums m_InventoryPaintSlots; -- cgit v1.2.3