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/cPlayer.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'source/cPlayer.h') diff --git a/source/cPlayer.h b/source/cPlayer.h index 6f8cbfca6..105a4924c 100644 --- a/source/cPlayer.h +++ b/source/cPlayer.h @@ -1,3 +1,4 @@ + #pragma once #include "cPawn.h" @@ -14,7 +15,10 @@ class cInventory; class cClientHandle; -class cPlayer : public cPawn //tolua_export + + + +class cPlayer : public cPawn //tolua_export { //tolua_export public: CLASS_PROTOTYPE(); @@ -24,8 +28,8 @@ public: virtual void Initialize( cWorld* a_World ); //tolua_export - virtual void SpawnOn( cClientHandle* a_Target ); - virtual void Tick(float a_Dt); + virtual cPacket * GetSpawnPacket(void) const override; + virtual void Tick(float a_Dt) override; void SetTouchGround( bool a_bTouchGround ); inline void SetStance( const double & a_Stance ) { m_Stance = a_Stance; } @@ -71,7 +75,7 @@ public: StringList GetResolvedPermissions(); // >> EXPORTED IN MANUALBINDINGS << bool IsInGroup( const char* a_Group ); //tolua_export - std::string GetColor(); //tolua_export + AString GetColor(void) const; //tolua_export void TossItem( bool a_bDraggingItem, int a_Amount = 1 ); //tolua_export -- cgit v1.2.3