From a431b45641d119a91a74cd88768389eebeb54a68 Mon Sep 17 00:00:00 2001 From: LogicParrot Date: Tue, 5 Apr 2016 11:45:09 +0300 Subject: Improved player freeze code --- src/Entities/Player.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/Entities/Player.h') diff --git a/src/Entities/Player.h b/src/Entities/Player.h index 777a533c9..f04bcdd39 100644 --- a/src/Entities/Player.h +++ b/src/Entities/Player.h @@ -50,7 +50,7 @@ public: virtual void Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override; - void TickFreezeCode(bool a_MyChunkIsSent); + void TickFreezeCode(); virtual void HandlePhysics(std::chrono::milliseconds a_Dt, cChunk &) override { UNUSED(a_Dt); } @@ -148,9 +148,6 @@ public: /** Is the player frozen? */ bool IsFrozen(); - /** How long has the player been frozen? */ - int GetFrozenDuration(); - /** Cancels Freeze(...) and allows the player to move naturally. */ void Unfreeze(); @@ -605,15 +602,9 @@ protected: cSlotNums m_InventoryPaintSlots; - /** if m_IsFrozen is true, we lock m_Location to this position. */ - Vector3d m_FrozenPosition; - /** If true, we are locking m_Position to m_FrozenPosition. */ bool m_IsFrozen; - /** */ - int m_FreezeCounter; - /** Was the player frozen manually by a plugin or automatically by the server? */ bool m_IsManuallyFrozen; -- cgit v1.2.3