summaryrefslogtreecommitdiffstats
path: root/source/cWorld.h
diff options
context:
space:
mode:
authorfaketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-01-19 19:12:39 +0100
committerfaketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-01-19 19:12:39 +0100
commit50a7722242197f9a3b4300e154c1e66d1177839a (patch)
treeebf80972e3fe85806c1df037579e9a20992b5766 /source/cWorld.h
parentFixed crashing bug in cClientHandle::~cClientHandle (diff)
downloadcuberite-50a7722242197f9a3b4300e154c1e66d1177839a.tar
cuberite-50a7722242197f9a3b4300e154c1e66d1177839a.tar.gz
cuberite-50a7722242197f9a3b4300e154c1e66d1177839a.tar.bz2
cuberite-50a7722242197f9a3b4300e154c1e66d1177839a.tar.lz
cuberite-50a7722242197f9a3b4300e154c1e66d1177839a.tar.xz
cuberite-50a7722242197f9a3b4300e154c1e66d1177839a.tar.zst
cuberite-50a7722242197f9a3b4300e154c1e66d1177839a.zip
Diffstat (limited to '')
-rw-r--r--source/cWorld.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/source/cWorld.h b/source/cWorld.h
index ab99c11b1..38b7ec349 100644
--- a/source/cWorld.h
+++ b/source/cWorld.h
@@ -13,6 +13,7 @@ enum ENUM_ITEM_ID;
#include <string>
#include "cSimulatorManager.h"
+#include "ptr_cChunk.h"
class cPacket;
class cRedstone;
@@ -36,7 +37,7 @@ class cWorld //tolua_export
public:
typedef std::list< cClientHandle* > ClientList;
typedef std::list< cEntity* > EntityList;
- typedef std::list< cChunk* > ChunkList;
+ typedef std::list< ptr_cChunk > ChunkList;
typedef std::list< cPlayer* > PlayerList;
std::vector<int> m_RSList;
@@ -56,7 +57,7 @@ public:
cChunk* GetChunk( int a_X, int a_Y, int a_Z );
cChunk* GetChunkReliable( int a_X, int a_Y, int a_Z );
- cChunk* GetChunkUnreliable( int a_X, int a_Y, int a_Z );
+ ptr_cChunk GetChunkUnreliable( int a_X, int a_Y, int a_Z );
cChunk* GetChunkOfBlock( int a_X, int a_Y, int a_Z );
char GetHeight( int a_X, int a_Z ); //tolua_export
@@ -148,14 +149,14 @@ public:
void LockChunks();
void UnlockChunks();
- void ReSpreadLighting( cChunk* a_Chunk );
- void RemoveSpread( cChunk* a_Chunk );
+ void ReSpreadLighting( const ptr_cChunk& a_Chunk );
+ void RemoveSpread( const ptr_cChunk& a_Chunk );
void InitializeSpawn();
- void CastThunderbolt ( int, int, int ); //tolua_export
+ void CastThunderbolt ( int, int, int ); //tolua_export
void SetWeather ( int ); //tolua_export
- int GetWeather() { return m_Weather; }; //tolua_export
+ int GetWeather() { return m_Weather; }; //tolua_export
cWorldGenerator* GetWorldGenerator() { return m_WorldGenerator; }
private: