diff options
| author | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-22 17:25:02 +0100 |
|---|---|---|
| committer | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-22 17:25:02 +0100 |
| commit | 10e5540f985c003eff260c1d9f56d84fb78d4c79 (patch) | |
| tree | 3b0f91625a1125c9d8f6af4fb799c78b0bdfcab9 | |
| parent | merged in changes (diff) | |
| parent | Fixed compilation in VC2008. (diff) | |
| download | cuberite-10e5540f985c003eff260c1d9f56d84fb78d4c79.tar cuberite-10e5540f985c003eff260c1d9f56d84fb78d4c79.tar.gz cuberite-10e5540f985c003eff260c1d9f56d84fb78d4c79.tar.bz2 cuberite-10e5540f985c003eff260c1d9f56d84fb78d4c79.tar.lz cuberite-10e5540f985c003eff260c1d9f56d84fb78d4c79.tar.xz cuberite-10e5540f985c003eff260c1d9f56d84fb78d4c79.tar.zst cuberite-10e5540f985c003eff260c1d9f56d84fb78d4c79.zip | |
| -rw-r--r-- | src/BlockEntities/BlockEntity.h | 3 | ||||
| -rw-r--r-- | src/ChunkDef.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/BlockEntities/BlockEntity.h b/src/BlockEntities/BlockEntity.h index c3b8d41c0..7c6688f8d 100644 --- a/src/BlockEntities/BlockEntity.h +++ b/src/BlockEntities/BlockEntity.h @@ -87,10 +87,9 @@ 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/ChunkDef.h b/src/ChunkDef.h index bf41aa625..7d727a4d4 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); |