From de03dd6460c59c8abdd5b613ffa73511486022fc Mon Sep 17 00:00:00 2001 From: "keyboard.osh@gmail.com" Date: Mon, 22 Apr 2013 07:18:03 +0000 Subject: Moved physics to the cEntity class from the derivative classes (cMonster, cPickup). Added physics override to cPlayer to disable physics calculations. Fixed bug with pitch calculations on mobs. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1400 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Pickup.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'source/Pickup.h') diff --git a/source/Pickup.h b/source/Pickup.h index b6a8130da..74dceae4b 100644 --- a/source/Pickup.h +++ b/source/Pickup.h @@ -36,7 +36,6 @@ public: virtual bool CollectedBy(cPlayer * a_Dest); // tolua_export virtual void Tick(float a_Dt, cChunk & a_Chunk) override; - virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) override; short GetHealth(void) const { return m_Health; } @@ -49,8 +48,6 @@ private: Vector3d m_ResultingSpeed; //Can be used to modify the resulting speed for the current tick ;) Vector3d m_WaterSpeed; - bool m_bOnGround; - bool m_bReplicated; float m_Timer; -- cgit v1.2.3