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/cSignEntity.h | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'source/cSignEntity.h') diff --git a/source/cSignEntity.h b/source/cSignEntity.h index 31413c8c3..0c9e40710 100644 --- a/source/cSignEntity.h +++ b/source/cSignEntity.h @@ -1,7 +1,7 @@ + #pragma once #include "cBlockEntity.h" -#include "FileDefine.h" @@ -16,11 +16,11 @@ namespace Json -class cWorld; -class cSignEntity : public cBlockEntity +class cSignEntity : + public cBlockEntity { public: - cSignEntity(ENUM_BLOCK_ID a_BlockType, int a_X, int a_Y, int a_Z, cChunk* a_Chunk); + cSignEntity(ENUM_BLOCK_ID a_BlockType, int a_X, int a_Y, int a_Z, cWorld * a_World); virtual ~cSignEntity(); bool LoadFromFile(cFile & a_File); // deprecated format @@ -28,15 +28,17 @@ public: bool LoadFromJson( const Json::Value& a_Value ); void SaveToJson( Json::Value& a_Value ); - void SetLines( const std::string & a_Line1, const std::string & a_Line2, const std::string & a_Line3, const std::string & a_Line4 ); - void SetLine( int a_Index, std::string a_Line ); + void SetLines( const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4 ); + void SetLine( int a_Index, const AString & a_Line ); - std::string GetLine( int a_Index ); + AString GetLine( int a_Index ) const; virtual void UsedBy( cPlayer & a_Player ); virtual void SendTo( cClientHandle* a_Client ); + private: - std::string m_Line[4]; + + AString m_Line[4]; }; -- cgit v1.2.3