flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fix comments

Browse Source
This commit is contained in:
tycho
2015-05-28 12:29:26 +01:00
parent e19693e529
commit b2fa71a32a
20 changed files with 82 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Simulator/DelayedFluidSimulator.cpp
View File

@@ -99,7 +99,7 @@ void cDelayedFluidSimulator::AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ,
return;
}
void * ChunkDataRaw = (m_FluidBlock == E_BLOCK_WATER) ? a_Chunk->GetWaterSimulatorData() : a_Chunk->GetLavaSimulatorData();
auto ChunkDataRaw = (m_FluidBlock == E_BLOCK_WATER) ? a_Chunk->GetWaterSimulatorData() : a_Chunk->GetLavaSimulatorData();
cDelayedFluidSimulatorChunkData * ChunkData = static_cast<cDelayedFluidSimulatorChunkData *>(ChunkDataRaw);
cDelayedFluidSimulatorChunkData::cSlot & Slot = ChunkData->m_Slots[m_AddSlotNum];
@@ -132,7 +132,7 @@ void cDelayedFluidSimulator::Simulate(float a_Dt)
void cDelayedFluidSimulator::SimulateChunk(std::chrono::milliseconds a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk)
{
void * ChunkDataRaw = (m_FluidBlock == E_BLOCK_WATER) ? a_Chunk->GetWaterSimulatorData() : a_Chunk->GetLavaSimulatorData();
auto ChunkDataRaw = (m_FluidBlock == E_BLOCK_WATER) ? a_Chunk->GetWaterSimulatorData() : a_Chunk->GetLavaSimulatorData();
cDelayedFluidSimulatorChunkData * ChunkData = static_cast<cDelayedFluidSimulatorChunkData *>(ChunkDataRaw);
cDelayedFluidSimulatorChunkData::cSlot & Slot = ChunkData->m_Slots[m_SimSlotNum];

8
src/Simulator/FloodyFluidSimulator.cpp
View File

@@ -260,7 +260,9 @@ void cFloodyFluidSimulator::SpreadToNeighbor(cChunk * a_NearChunk, int a_RelX, i
static_cast<double>(BlockX),
static_cast<double>(a_RelY),
static_cast<double>(BlockZ),
0.5f, 1.5f);
0.5f,
1.5f
);
return;
}
}
@@ -280,7 +282,9 @@ void cFloodyFluidSimulator::SpreadToNeighbor(cChunk * a_NearChunk, int a_RelX, i
static_cast<double>(BlockX),
static_cast<double>(a_RelY),
static_cast<double>(BlockZ),
0.5f, 1.5f);
0.5f,
1.5f
);
return;
}
}

9
src/Simulator/SandSimulator.cpp
View File

@@ -267,10 +267,11 @@ void cSandSimulator::FinishFalling(
cItems Pickups;
Pickups.Add(static_cast<ENUM_ITEM_ID>(a_FallingBlockType), 1, a_FallingBlockMeta);
a_World->SpawnItemPickups(
Pickups,
static_cast<double>(a_BlockX) + 0.5,
static_cast<double>(a_BlockY) + 0.5,
static_cast<double>(a_BlockZ) + 0.5);
Pickups,
static_cast<double>(a_BlockX) + 0.5,
static_cast<double>(a_BlockY) + 0.5,
static_cast<double>(a_BlockZ) + 0.5
);
}

4
src/Simulator/VaporizeFluidSimulator.cpp
View File

@@ -40,7 +40,9 @@ void cVaporizeFluidSimulator::AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ,
static_cast<double>(a_BlockX),
static_cast<double>(a_BlockY),
static_cast<double>(a_BlockZ),
1.0f, 0.6f);
1.0f,
0.6f
);
}
}