summaryrefslogtreecommitdiffstats
path: root/src/ChunkMap.h
diff options
context:
space:
mode:
authorLO1ZB <andreasdaamen@web.de>2014-08-28 11:36:35 +0200
committerLO1ZB <andreasdaamen@web.de>2014-08-28 11:36:35 +0200
commit3c1c073714e2b0542c9a79db962b6fc9e6ddd352 (patch)
treecf8c191b1642914745944fa376ba1f2f56a95ea6 /src/ChunkMap.h
parentDungeonRooms: Fixed an off-by-one error. (diff)
downloadcuberite-3c1c073714e2b0542c9a79db962b6fc9e6ddd352.tar
cuberite-3c1c073714e2b0542c9a79db962b6fc9e6ddd352.tar.gz
cuberite-3c1c073714e2b0542c9a79db962b6fc9e6ddd352.tar.bz2
cuberite-3c1c073714e2b0542c9a79db962b6fc9e6ddd352.tar.lz
cuberite-3c1c073714e2b0542c9a79db962b6fc9e6ddd352.tar.xz
cuberite-3c1c073714e2b0542c9a79db962b6fc9e6ddd352.tar.zst
cuberite-3c1c073714e2b0542c9a79db962b6fc9e6ddd352.zip
Diffstat (limited to '')
-rw-r--r--src/ChunkMap.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/ChunkMap.h b/src/ChunkMap.h
index 1e9a0f982..6a379e51d 100644
--- a/src/ChunkMap.h
+++ b/src/ChunkMap.h
@@ -270,16 +270,16 @@ public:
bool GetSignLines (int a_BlockX, int a_BlockY, int a_BlockZ, AString & a_Line1, AString & a_Line2, AString & a_Line3, AString & a_Line4); // Lua-accessible
/** Touches the chunk, causing it to be loaded or generated */
- void TouchChunk(int a_ChunkX, int a_ChunkY, int a_ChunkZ);
+ void TouchChunk(int a_ChunkX, int a_ChunkZ);
/** Loads the chunk, if not already loaded. Doesn't generate. Returns true if chunk valid (even if already loaded before) */
- bool LoadChunk(int a_ChunkX, int a_ChunkY, int a_ChunkZ);
+ bool LoadChunk(int a_ChunkX, int a_ChunkZ);
/** Loads the chunks specified. Doesn't report failure, other than chunks being !IsValid() */
void LoadChunks(const cChunkCoordsList & a_Chunks);
/** Marks the chunk as failed-to-load */
- void ChunkLoadFailed(int a_ChunkX, int a_ChunkY, int a_ChunkZ);
+ void ChunkLoadFailed(int a_ChunkX, int a_ChunkZ);
/** Sets the sign text. Returns true if sign text changed. */
bool SetSignLines(int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4);
@@ -363,7 +363,7 @@ private:
~cChunkLayer();
/** Always returns an assigned chunkptr, but the chunk needn't be valid (loaded / generated) - callers must check */
- cChunkPtr GetChunk( int a_ChunkX, int a_ChunkY, int a_ChunkZ);
+ cChunkPtr GetChunk( int a_ChunkX, int a_ChunkZ);
/** Returns the specified chunk, or NULL if not created yet */
cChunk * FindChunk(int a_ChunkX, int a_ChunkZ);
@@ -456,9 +456,9 @@ private:
std::auto_ptr<cAllocationPool<cChunkData::sChunkSection> > m_Pool;
- cChunkPtr GetChunk (int a_ChunkX, int a_ChunkY, int a_ChunkZ); // Also queues the chunk for loading / generating if not valid
- cChunkPtr GetChunkNoGen (int a_ChunkX, int a_ChunkY, int a_ChunkZ); // Also queues the chunk for loading if not valid; doesn't generate
- cChunkPtr GetChunkNoLoad(int a_ChunkX, int a_ChunkY, int a_ChunkZ); // Doesn't load, doesn't generate
+ cChunkPtr GetChunk (int a_ChunkX, int a_ChunkZ); // Also queues the chunk for loading / generating if not valid
+ cChunkPtr GetChunkNoGen (int a_ChunkX, int a_ChunkZ); // Also queues the chunk for loading if not valid; doesn't generate
+ cChunkPtr GetChunkNoLoad(int a_ChunkX, int a_ChunkZ); // Doesn't load, doesn't generate
/** Gets a block in any chunk while in the cChunk's Tick() method; returns true if successful, false if chunk not loaded (doesn't queue load) */
bool LockedGetBlock(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta);