summaryrefslogtreecommitdiffstats
path: root/src/Simulator/FluidSimulator.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2013-12-09 21:16:57 +0100
committerMattes D <github@xoft.cz>2013-12-09 21:16:57 +0100
commit567354b3caf1c7798ee12b48103421c022a0afe1 (patch)
treead9d9680ee78a0a9ba8d1fc5e63045c07528f286 /src/Simulator/FluidSimulator.cpp
parentFixed angle normalization typo. (diff)
parentfixed warnings in src/Generating/BioGen.cpp (diff)
downloadcuberite-567354b3caf1c7798ee12b48103421c022a0afe1.tar
cuberite-567354b3caf1c7798ee12b48103421c022a0afe1.tar.gz
cuberite-567354b3caf1c7798ee12b48103421c022a0afe1.tar.bz2
cuberite-567354b3caf1c7798ee12b48103421c022a0afe1.tar.lz
cuberite-567354b3caf1c7798ee12b48103421c022a0afe1.tar.xz
cuberite-567354b3caf1c7798ee12b48103421c022a0afe1.tar.zst
cuberite-567354b3caf1c7798ee12b48103421c022a0afe1.zip
Diffstat (limited to 'src/Simulator/FluidSimulator.cpp')
-rw-r--r--src/Simulator/FluidSimulator.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Simulator/FluidSimulator.cpp b/src/Simulator/FluidSimulator.cpp
index dac666484..72b2eb628 100644
--- a/src/Simulator/FluidSimulator.cpp
+++ b/src/Simulator/FluidSimulator.cpp
@@ -1,4 +1,3 @@
-
#include "Globals.h"
#include "FluidSimulator.h"
@@ -138,7 +137,7 @@ Direction cFluidSimulator::GetFlowingDirection(int a_X, int a_Y, int a_Z, bool a
*/
NIBBLETYPE LowestPoint = m_World.GetBlockMeta(a_X, a_Y, a_Z); //Current Block Meta so only lower points will be counted
- int X = 0, Y = 0, Z = 0; //Lowest Pos will be stored here
+ int X = 0, Z = 0; //Lowest Pos will be stored here
if (IsAllowedBlock(m_World.GetBlock(a_X, a_Y + 1, a_Z)) && a_Over) //check for upper block to flow because this also affects the flowing direction
{
@@ -167,14 +166,14 @@ Direction cFluidSimulator::GetFlowingDirection(int a_X, int a_Y, int a_Z, bool a
{
LowestPoint = Meta;
X = Pos->x;
- Y = Pos->y;
+ Pos->y; //Remove if no side effects
Z = Pos->z;
}
}else if(BlockID == E_BLOCK_AIR)
{
LowestPoint = 9; //This always dominates
X = Pos->x;
- Y = Pos->y;
+ Pos->y; //Remove if no side effects
Z = Pos->z;
}