summaryrefslogtreecommitdiffstats
path: root/src/Simulator
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-07-20 23:10:31 +0200
committermadmaxoft <github@xoft.cz>2014-07-21 17:38:50 +0200
commit6be79575fd50e37ac275bd0cb9d16f9e51e8a225 (patch)
treeb02e68b73bf1152f9d84020ee006d5325e096691 /src/Simulator
parentCuboid: added explicit copy assignment operator (diff)
downloadcuberite-6be79575fd50e37ac275bd0cb9d16f9e51e8a225.tar
cuberite-6be79575fd50e37ac275bd0cb9d16f9e51e8a225.tar.gz
cuberite-6be79575fd50e37ac275bd0cb9d16f9e51e8a225.tar.bz2
cuberite-6be79575fd50e37ac275bd0cb9d16f9e51e8a225.tar.lz
cuberite-6be79575fd50e37ac275bd0cb9d16f9e51e8a225.tar.xz
cuberite-6be79575fd50e37ac275bd0cb9d16f9e51e8a225.tar.zst
cuberite-6be79575fd50e37ac275bd0cb9d16f9e51e8a225.zip
Diffstat (limited to 'src/Simulator')
-rw-r--r--src/Simulator/FireSimulator.cpp2
-rw-r--r--src/Simulator/FluidSimulator.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Simulator/FireSimulator.cpp b/src/Simulator/FireSimulator.cpp
index 2164b6b10..69dc7164e 100644
--- a/src/Simulator/FireSimulator.cpp
+++ b/src/Simulator/FireSimulator.cpp
@@ -140,7 +140,7 @@ void cFireSimulator::SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChun
continue;
}
- if((itr->y > 0) && (!DoesBurnForever(a_Chunk->GetBlock(itr->x, itr->y - 1, itr->z))))
+ if ((itr->y > 0) && (!DoesBurnForever(a_Chunk->GetBlock(itr->x, itr->y - 1, itr->z))))
{
a_Chunk->SetMeta(x, y, z, BlockMeta + 1);
}
diff --git a/src/Simulator/FluidSimulator.cpp b/src/Simulator/FluidSimulator.cpp
index 499e204a1..58501326f 100644
--- a/src/Simulator/FluidSimulator.cpp
+++ b/src/Simulator/FluidSimulator.cpp
@@ -159,18 +159,18 @@ Direction cFluidSimulator::GetFlowingDirection(int a_X, int a_Y, int a_Z, bool a
{
Vector3i *Pos = (*it);
char BlockID = m_World.GetBlock(Pos->x, Pos->y, Pos->z);
- if(IsAllowedBlock(BlockID))
+ if (IsAllowedBlock(BlockID))
{
char Meta = m_World.GetBlockMeta(Pos->x, Pos->y, Pos->z);
- if(Meta > LowestPoint)
+ if (Meta > LowestPoint)
{
LowestPoint = Meta;
X = Pos->x;
Z = Pos->z;
}
}
- else if(BlockID == E_BLOCK_AIR)
+ else if (BlockID == E_BLOCK_AIR)
{
LowestPoint = 9; // This always dominates
X = Pos->x;