summaryrefslogtreecommitdiffstats
path: root/src/Chunk.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2013-12-08 18:07:34 +0100
committerMattes D <github@xoft.cz>2013-12-08 18:07:34 +0100
commit6f23d2ec94b30e355edc63c2de464d40ff3d0ed8 (patch)
tree3127fecd22be0f755e81c384c72a171e52987458 /src/Chunk.h
parentRemoved unused ToLua files. (diff)
parentFixed binding generation and VS2013 compile (diff)
downloadcuberite-6f23d2ec94b30e355edc63c2de464d40ff3d0ed8.tar
cuberite-6f23d2ec94b30e355edc63c2de464d40ff3d0ed8.tar.gz
cuberite-6f23d2ec94b30e355edc63c2de464d40ff3d0ed8.tar.bz2
cuberite-6f23d2ec94b30e355edc63c2de464d40ff3d0ed8.tar.lz
cuberite-6f23d2ec94b30e355edc63c2de464d40ff3d0ed8.tar.xz
cuberite-6f23d2ec94b30e355edc63c2de464d40ff3d0ed8.tar.zst
cuberite-6f23d2ec94b30e355edc63c2de464d40ff3d0ed8.zip
Diffstat (limited to '')
-rw-r--r--src/Chunk.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Chunk.h b/src/Chunk.h
index f13eb9a03..9e5d117c5 100644
--- a/src/Chunk.h
+++ b/src/Chunk.h
@@ -149,7 +149,7 @@ public:
void SetBlock( const Vector3i & a_RelBlockPos, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta ) { SetBlock( a_RelBlockPos.x, a_RelBlockPos.y, a_RelBlockPos.z, a_BlockType, a_BlockMeta ); }
/// Queues a block change till the specified world tick
- void QueueSetBlock(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Int64 a_Tick);
+ void QueueSetBlock(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Int64 a_Tick, BLOCKTYPE a_PreviousBlockType = E_BLOCK_AIR);
/// Queues block for ticking (m_ToTickQueue)
void QueueTickBlock(int a_RelX, int a_RelY, int a_RelZ);
@@ -271,7 +271,7 @@ public:
void BroadcastEntityRelMoveLook (const cEntity & a_Entity, char a_RelX, char a_RelY, char a_RelZ, const cClientHandle * a_Exclude = NULL);
void BroadcastEntityStatus (const cEntity & a_Entity, char a_Status, const cClientHandle * a_Exclude = NULL);
void BroadcastEntityVelocity (const cEntity & a_Entity, const cClientHandle * a_Exclude = NULL);
- void BroadcastPlayerAnimation (const cPlayer & a_Player, char a_Animation, const cClientHandle * a_Exclude = NULL);
+ void BroadcastEntityAnimation (const cEntity & a_Entity, char a_Animation, const cClientHandle * a_Exclude = NULL);
void BroadcastSoundEffect (const AString & a_SoundName, int a_SrcX, int a_SrcY, int a_SrcZ, float a_Volume, float a_Pitch, const cClientHandle * a_Exclude = NULL); // a_Src coords are Block * 8
void BroadcastSoundParticleEffect(int a_EffectID, int a_SrcX, int a_SrcY, int a_SrcZ, int a_Data, const cClientHandle * a_Exclude = NULL);
void BroadcastSpawnEntity (cEntity & a_Entity, const cClientHandle * a_Exclude = NULL);
@@ -363,9 +363,10 @@ private:
BLOCKTYPE m_BlockType;
NIBBLETYPE m_BlockMeta;
Int64 m_Tick;
+ BLOCKTYPE m_PreviousType;
- sSetBlockQueueItem(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Int64 a_Tick) :
- m_RelX(a_RelX), m_RelY(a_RelY), m_RelZ(a_RelZ), m_BlockType(a_BlockType), m_BlockMeta(a_BlockMeta), m_Tick(a_Tick)
+ sSetBlockQueueItem(int a_RelX, int a_RelY, int a_RelZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Int64 a_Tick, BLOCKTYPE a_PreviousBlockType) :
+ m_RelX(a_RelX), m_RelY(a_RelY), m_RelZ(a_RelZ), m_BlockType(a_BlockType), m_BlockMeta(a_BlockMeta), m_Tick(a_Tick), m_PreviousType(a_PreviousBlockType)
{
}
} ;