summaryrefslogtreecommitdiffstats
path: root/source/cWorld.h
diff options
context:
space:
mode:
authorfaketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-03-01 16:18:59 +0100
committerfaketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-03-01 16:18:59 +0100
commit867fc8ee0dbebd3c09a4f7cdcbd5fb4d56f194dc (patch)
treea2f8b4a22a9b721d94ffa595ef57a07d1339f482 /source/cWorld.h
parentFixed the authenticator bug (diff)
downloadcuberite-867fc8ee0dbebd3c09a4f7cdcbd5fb4d56f194dc.tar
cuberite-867fc8ee0dbebd3c09a4f7cdcbd5fb4d56f194dc.tar.gz
cuberite-867fc8ee0dbebd3c09a4f7cdcbd5fb4d56f194dc.tar.bz2
cuberite-867fc8ee0dbebd3c09a4f7cdcbd5fb4d56f194dc.tar.lz
cuberite-867fc8ee0dbebd3c09a4f7cdcbd5fb4d56f194dc.tar.xz
cuberite-867fc8ee0dbebd3c09a4f7cdcbd5fb4d56f194dc.tar.zst
cuberite-867fc8ee0dbebd3c09a4f7cdcbd5fb4d56f194dc.zip
Diffstat (limited to 'source/cWorld.h')
-rw-r--r--source/cWorld.h16
1 files changed, 11 insertions, 5 deletions
diff --git a/source/cWorld.h b/source/cWorld.h
index f8d6fe1bc..3b8f7b059 100644
--- a/source/cWorld.h
+++ b/source/cWorld.h
@@ -14,6 +14,7 @@
#include "cChunkMap.h"
#include "WorldStorage.h"
#include "cChunkGenerator.h"
+#include "Vector3i.h"
@@ -25,6 +26,7 @@ class cFireSimulator;
class cWaterSimulator;
class cLavaSimulator;
class cSandSimulator;
+class cRedstoneSimulator;
class cItem;
class cPlayer;
class cClientHandle;
@@ -147,8 +149,11 @@ public:
void SetBlock( int a_X, int a_Y, int a_Z, char a_BlockType, char a_BlockMeta ); //tolua_export
void FastSetBlock( int a_X, int a_Y, int a_Z, char a_BlockType, char a_BlockMeta ); //tolua_export
char GetBlock( int a_X, int a_Y, int a_Z ); //tolua_export
+ char GetBlock( const Vector3i & a_Pos ) { return GetBlock( a_Pos.x, a_Pos.y, a_Pos.z ); } //tolua_export
char GetBlockMeta( int a_X, int a_Y, int a_Z ); //tolua_export
+ char GetBlockMeta( const Vector3i & a_Pos ) { return GetBlockMeta( a_Pos.x, a_Pos.y, a_Pos.z ); } //tolua_export
void SetBlockMeta( int a_X, int a_Y, int a_Z, char a_MetaData ); //tolua_export
+ void SetBlockMeta( const Vector3i & a_Pos, char a_MetaData ) { SetBlockMeta( a_Pos.x, a_Pos.y, a_Pos.z, a_MetaData ); } //tolua_export
bool DigBlock( int a_X, int a_Y, int a_Z, cItem & a_PickupItem ); //tolua_export
void SendBlockTo( int a_X, int a_Y, int a_Z, cPlayer* a_Player ); //tolua_export
@@ -237,11 +242,12 @@ private:
friend class cRedstone;
std::vector<int> m_RSList;
- cSimulatorManager * m_SimulatorManager;
- cSandSimulator * m_SandSimulator;
- cWaterSimulator * m_WaterSimulator;
- cLavaSimulator * m_LavaSimulator;
- cFireSimulator * m_FireSimulator;
+ cSimulatorManager * m_SimulatorManager;
+ cSandSimulator * m_SandSimulator;
+ cWaterSimulator * m_WaterSimulator;
+ cLavaSimulator * m_LavaSimulator;
+ cFireSimulator * m_FireSimulator;
+ cRedstoneSimulator * m_RedstoneSimulator;
cCriticalSection m_CSClients;
cCriticalSection m_CSEntities;