From 4f17362aeb80e5339c58a5d3b0fbaeb88d9e701c Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Mon, 13 Feb 2012 21:47:03 +0000 Subject: Rewritten most of the code for multithreading; still not 100%, but getting there. If this commit proves to be too problematic, we can always undo it. git-svn-id: http://mc-server.googlecode.com/svn/trunk@251 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cPickup.h | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) (limited to 'source/cPickup.h') diff --git a/source/cPickup.h b/source/cPickup.h index fead89447..22af39367 100644 --- a/source/cPickup.h +++ b/source/cPickup.h @@ -1,38 +1,53 @@ + #pragma once #include "cEntity.h" + + class cPacket_PickupSpawn; class cPlayer; class cItem; + + + + + class cPickup : public cEntity //tolua_export { //tolua_export public: CLASS_PROTOTYPE(); cPickup(int a_X, int a_Y, int a_Z, const cItem & a_Item, float a_SpeedX = 0.f, float a_SpeedY = 0.f, float a_SpeedZ = 0.f); //tolua_export - cPickup(cPacket_PickupSpawn* a_PickupSpawnPacket); //tolua_export + cPickup(cPacket_PickupSpawn * a_PickupSpawnPacket); //tolua_export ~cPickup(); //tolua_export - cItem* GetItem() { return m_Item; } //tolua_export + cItem * GetItem() { return m_Item; } //tolua_export - void SpawnOn( cClientHandle* a_Target ); + virtual cPacket * GetSpawnPacket(void) const override; + virtual bool CollectedBy( cPlayer* a_Dest ); //tolua_export void Tick(float a_Dt); void HandlePhysics(float a_Dt); + private: - Vector3f* m_Speed; - Vector3f* m_ResultingSpeed; //Can be used to modify the resulting speed for the current tick ;) - Vector3f* m_WaterSpeed; - bool m_bOnGround; - bool m_bReplicated; + Vector3f * m_Speed; + Vector3f * m_ResultingSpeed; //Can be used to modify the resulting speed for the current tick ;) + + Vector3f * m_WaterSpeed; + bool m_bOnGround; + bool m_bReplicated; float m_Timer; cItem* m_Item; bool m_bCollected; -};//tolua_export \ No newline at end of file +}; //tolua_export + + + + -- cgit v1.2.3