diff options
| author | tycho <work.tycho@gmail.com> | 2015-05-28 13:29:26 +0200 |
|---|---|---|
| committer | tycho <work.tycho@gmail.com> | 2015-05-28 13:54:04 +0200 |
| commit | b2fa71a32ac8bd86bda778a5d54fe2e7e471a1c0 (patch) | |
| tree | ff9846d0ffa558e237ea148762f67b5ebf71a47d /src/Simulator/DelayedFluidSimulator.cpp | |
| parent | Merge branch 'master' into PreventNewWarnings (diff) | |
| download | cuberite-b2fa71a32ac8bd86bda778a5d54fe2e7e471a1c0.tar cuberite-b2fa71a32ac8bd86bda778a5d54fe2e7e471a1c0.tar.gz cuberite-b2fa71a32ac8bd86bda778a5d54fe2e7e471a1c0.tar.bz2 cuberite-b2fa71a32ac8bd86bda778a5d54fe2e7e471a1c0.tar.lz cuberite-b2fa71a32ac8bd86bda778a5d54fe2e7e471a1c0.tar.xz cuberite-b2fa71a32ac8bd86bda778a5d54fe2e7e471a1c0.tar.zst cuberite-b2fa71a32ac8bd86bda778a5d54fe2e7e471a1c0.zip | |
Diffstat (limited to 'src/Simulator/DelayedFluidSimulator.cpp')
| -rw-r--r-- | src/Simulator/DelayedFluidSimulator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Simulator/DelayedFluidSimulator.cpp b/src/Simulator/DelayedFluidSimulator.cpp index cbf70bf05..e0da3ff61 100644 --- a/src/Simulator/DelayedFluidSimulator.cpp +++ b/src/Simulator/DelayedFluidSimulator.cpp @@ -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]; |