summaryrefslogtreecommitdiffstats
path: root/src/ChunkMap.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2016-01-06 16:20:12 +0100
committerMattes D <github@xoft.cz>2016-01-06 16:20:12 +0100
commit491dbda7d33a154e71c68f2fd79e55436cc24eae (patch)
tree58db7ffefac6b6878f9ebc37ff7d754f56cceabd /src/ChunkMap.cpp
parentMerge pull request #2844 from mathias-github/silktouch (diff)
downloadcuberite-491dbda7d33a154e71c68f2fd79e55436cc24eae.tar
cuberite-491dbda7d33a154e71c68f2fd79e55436cc24eae.tar.gz
cuberite-491dbda7d33a154e71c68f2fd79e55436cc24eae.tar.bz2
cuberite-491dbda7d33a154e71c68f2fd79e55436cc24eae.tar.lz
cuberite-491dbda7d33a154e71c68f2fd79e55436cc24eae.tar.xz
cuberite-491dbda7d33a154e71c68f2fd79e55436cc24eae.tar.zst
cuberite-491dbda7d33a154e71c68f2fd79e55436cc24eae.zip
Diffstat (limited to '')
-rw-r--r--src/ChunkMap.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp
index edf42abe7..cbbf910fb 100644
--- a/src/ChunkMap.cpp
+++ b/src/ChunkMap.cpp
@@ -1896,10 +1896,10 @@ void cChunkMap::DoExplosionAt(double a_ExplosionSize, double a_BlockX, double a_
public cEntityCallback
{
public:
- cTNTDamageCallback(cBoundingBox & a_bbTNT, Vector3d a_ExplosionPos, int a_ExplosionSize) :
- m_bbTNT(a_bbTNT),
- m_ExplosionPos(a_ExplosionPos),
- m_ExplosionSize(a_ExplosionSize)
+ cTNTDamageCallback(cBoundingBox & a_CBBBTNT, Vector3d a_CBExplosionPos, int a_CBExplosionSize) :
+ m_bbTNT(a_CBBBTNT),
+ m_ExplosionPos(a_CBExplosionPos),
+ m_ExplosionSize(a_CBExplosionSize)
{
}
@@ -2364,10 +2364,10 @@ bool cChunkMap::GenerateChunk(int a_ChunkX, int a_ChunkZ, cChunkCoordCallback *
class cPrepareLoadCallback: public cChunkCoordCallback
{
public:
- cPrepareLoadCallback(cWorld & a_World, cChunkMap & a_ChunkMap, cChunkCoordCallback * a_Callback):
- m_World(a_World),
- m_ChunkMap(a_ChunkMap),
- m_Callback(a_Callback)
+ cPrepareLoadCallback(cWorld & a_CBWorld, cChunkMap & a_CBChunkMap, cChunkCoordCallback * a_CBCallback):
+ m_World(a_CBWorld),
+ m_ChunkMap(a_CBChunkMap),
+ m_Callback(a_CBCallback)
{
}
@@ -2385,7 +2385,7 @@ bool cChunkMap::GenerateChunk(int a_ChunkX, int a_ChunkZ, cChunkCoordCallback *
}
// The chunk failed to load, generate it:
- cCSLock Lock(m_ChunkMap.m_CSLayers);
+ cCSLock CBLock(m_ChunkMap.m_CSLayers);
cChunkPtr CBChunk = m_ChunkMap.GetChunkNoLoad(a_CBChunkX, a_CBChunkZ);
if (CBChunk == nullptr)