summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLO1ZB <andreasdaamen@web.de>2014-09-03 00:28:08 +0200
committerLO1ZB <andreasdaamen@web.de>2014-09-03 00:28:08 +0200
commit554f58501733f00f54e88190bc8ad85bfb11b84f (patch)
tree34070160e1c89cf9580a07ac1aa012d2ed4e303c
parenthopefully the last commit for removing y-coord from chunks. :) (diff)
downloadcuberite-554f58501733f00f54e88190bc8ad85bfb11b84f.tar
cuberite-554f58501733f00f54e88190bc8ad85bfb11b84f.tar.gz
cuberite-554f58501733f00f54e88190bc8ad85bfb11b84f.tar.bz2
cuberite-554f58501733f00f54e88190bc8ad85bfb11b84f.tar.lz
cuberite-554f58501733f00f54e88190bc8ad85bfb11b84f.tar.xz
cuberite-554f58501733f00f54e88190bc8ad85bfb11b84f.tar.zst
cuberite-554f58501733f00f54e88190bc8ad85bfb11b84f.zip
Diffstat (limited to '')
-rw-r--r--src/ChunkDef.h2
-rw-r--r--src/Generating/ChunkGenerator.cpp2
-rw-r--r--src/Generating/ChunkGenerator.h8
3 files changed, 6 insertions, 6 deletions
diff --git a/src/ChunkDef.h b/src/ChunkDef.h
index ded0bdf4c..7247cf5e4 100644
--- a/src/ChunkDef.h
+++ b/src/ChunkDef.h
@@ -404,7 +404,7 @@ public:
}
};
-typedef std::list<cChunkCoordsWithBool> cChunkCoordWithBoolList;
+typedef std::list<cChunkCoordsWithBool> cChunkCoordsWithBoolList;
diff --git a/src/Generating/ChunkGenerator.cpp b/src/Generating/ChunkGenerator.cpp
index 6216958d2..d39b44733 100644
--- a/src/Generating/ChunkGenerator.cpp
+++ b/src/Generating/ChunkGenerator.cpp
@@ -105,7 +105,7 @@ void cChunkGenerator::QueueGenerateChunk(int a_ChunkX, int a_ChunkZ, bool a_Forc
cCSLock Lock(m_CS);
// Check if it is already in the queue:
- for (cChunkCoordWithBoolList::iterator itr = m_Queue.begin(); itr != m_Queue.end(); ++itr)
+ for (cChunkCoordsWithBoolList::iterator itr = m_Queue.begin(); itr != m_Queue.end(); ++itr)
{
if ((itr->m_ChunkX == a_ChunkX) && (itr->m_ChunkZ == a_ChunkZ))
{
diff --git a/src/Generating/ChunkGenerator.h b/src/Generating/ChunkGenerator.h
index 0737834c9..e880a6766 100644
--- a/src/Generating/ChunkGenerator.h
+++ b/src/Generating/ChunkGenerator.h
@@ -137,10 +137,10 @@ private:
int m_Seed;
- cCriticalSection m_CS;
- cChunkCoordWithBoolList m_Queue;
- cEvent m_Event; ///< Set when an item is added to the queue or the thread should terminate
- cEvent m_evtRemoved; ///< Set when an item is removed from the queue
+ cCriticalSection m_CS;
+ cChunkCoordsWithBoolList m_Queue;
+ cEvent m_Event; ///< Set when an item is added to the queue or the thread should terminate
+ cEvent m_evtRemoved; ///< Set when an item is removed from the queue
cGenerator * m_Generator; ///< The actual generator engine used to generate chunks