summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTycho Bickerstaff <work.tycho@gmail.com>2013-12-22 17:22:25 +0100
committerTycho Bickerstaff <work.tycho@gmail.com>2013-12-22 17:22:25 +0100
commita295e0c34292a39a85c5b96094d21de48ae6bb3b (patch)
tree0c665be0af420b9241bca96a0dc5d4ef09c25c07 /src
parentmerged in warnings changes (diff)
parentconverted commneted paramater names to the unused macro (diff)
downloadcuberite-a295e0c34292a39a85c5b96094d21de48ae6bb3b.tar
cuberite-a295e0c34292a39a85c5b96094d21de48ae6bb3b.tar.gz
cuberite-a295e0c34292a39a85c5b96094d21de48ae6bb3b.tar.bz2
cuberite-a295e0c34292a39a85c5b96094d21de48ae6bb3b.tar.lz
cuberite-a295e0c34292a39a85c5b96094d21de48ae6bb3b.tar.xz
cuberite-a295e0c34292a39a85c5b96094d21de48ae6bb3b.tar.zst
cuberite-a295e0c34292a39a85c5b96094d21de48ae6bb3b.zip
Diffstat (limited to '')
-rw-r--r--src/BlockEntities/BlockEntity.h3
-rw-r--r--src/Chunk.cpp9
-rw-r--r--src/ChunkDef.h2
3 files changed, 12 insertions, 2 deletions
diff --git a/src/BlockEntities/BlockEntity.h b/src/BlockEntities/BlockEntity.h
index 7c6688f8d..c3b8d41c0 100644
--- a/src/BlockEntities/BlockEntity.h
+++ b/src/BlockEntities/BlockEntity.h
@@ -87,9 +87,10 @@ public:
virtual void SendTo(cClientHandle & a_Client) = 0;
/// Ticks the entity; returns true if the chunk should be marked as dirty as a result of this ticking. By default does nothing.
- virtual bool Tick(float a_Dt, cChunk & /* a_Chunk */)
+ virtual bool Tick(float a_Dt, cChunk & a_Chunk)
{
UNUSED(a_Dt);
+ UNUSED(a_Chunk);
return false;
}
diff --git a/src/Chunk.cpp b/src/Chunk.cpp
index b229a4aff..34cb6a534 100644
--- a/src/Chunk.cpp
+++ b/src/Chunk.cpp
@@ -529,6 +529,7 @@ void cChunk::SpawnMobs(cMobSpawner& a_MobSpawner)
/*
NIBBLETYPE SkyLight = 0;
+
NIBBLETYPE BlockLight = 0;
*/
@@ -2898,3 +2899,11 @@ NIBBLETYPE cChunk::GetTimeAlteredLight(NIBBLETYPE a_Skylight) const
+
+#if !C_CHUNK_USE_INLINE
+# include "cChunk.inl.h"
+#endif
+
+
+
+
diff --git a/src/ChunkDef.h b/src/ChunkDef.h
index 7d727a4d4..bf41aa625 100644
--- a/src/ChunkDef.h
+++ b/src/ChunkDef.h
@@ -180,7 +180,7 @@ public:
/// Converts absolute block coords into relative (chunk + block) coords:
- inline static void AbsoluteToRelative(/* in-out */ int & a_X, int & a_Y, int & a_Z, /* out */ int & a_ChunkX, int & a_ChunkZ )
+ inline static void AbsoluteToRelative(/* in-out */ int & a_X, int& a_Y, int & a_Z, /* out */ int & a_ChunkX, int & a_ChunkZ )
{
UNUSED(a_Y);
BlockToChunk(a_X, a_Z, a_ChunkX, a_ChunkZ);