From b18f657ac182155499398c6e7cb4c64af8f86f2e Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Thu, 14 Mar 2013 19:44:27 +0000 Subject: [PATCH] Added a Vaporize fluid simulator that simply replaces fluid blocks with air. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1270 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- VC2008/MCServer.vcproj | 8 ++++ source/Simulator/VaporizeFluidSimulator.cpp | 52 +++++++++++++++++++++ source/Simulator/VaporizeFluidSimulator.h | 34 ++++++++++++++ source/World.cpp | 8 ++++ 4 files changed, 102 insertions(+) create mode 100644 source/Simulator/VaporizeFluidSimulator.cpp create mode 100644 source/Simulator/VaporizeFluidSimulator.h diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj index 88a9798d4..3169e0dd7 100644 --- a/VC2008/MCServer.vcproj +++ b/VC2008/MCServer.vcproj @@ -1138,6 +1138,14 @@ RelativePath="..\source\Simulator\SimulatorManager.h" > + + + + GetPosX() * cChunkDef::Width; + int RelZ = a_BlockZ - a_Chunk->GetPosZ() * cChunkDef::Width; + BLOCKTYPE BlockType = a_Chunk->GetBlock(RelX, a_BlockY, RelZ); + if ( + (BlockType == m_FluidBlock) || + (BlockType == m_StationaryFluidBlock) + ) + { + a_Chunk->SetBlock(RelX, a_BlockY, RelZ, E_BLOCK_AIR, 0); + } +} + + + + + +void cVaporizeFluidSimulator::Simulate(float a_Dt) +{ + // Nothing needed +} + + + + diff --git a/source/Simulator/VaporizeFluidSimulator.h b/source/Simulator/VaporizeFluidSimulator.h new file mode 100644 index 000000000..c179c8ec4 --- /dev/null +++ b/source/Simulator/VaporizeFluidSimulator.h @@ -0,0 +1,34 @@ + +// VaporizeFluidSimulator.h + +// Declares the cVaporizeFluidSimulator class representing a fluid simulator that replaces all fluid blocks with air +// Useful for water simulation in the Nether + + + + + +#pragma once + +#include "FluidSimulator.h" + + + + + +class cVaporizeFluidSimulator : + public cFluidSimulator +{ + typedef cFluidSimulator super; + +public: + cVaporizeFluidSimulator(cWorld & a_World, BLOCKTYPE a_Fluid, BLOCKTYPE a_StationaryFluid); + + // cSimulator overrides: + virtual void AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk) override; + virtual void Simulate(float a_Dt) override; +} ; + + + + diff --git a/source/World.cpp b/source/World.cpp index 70b70d1f1..a82b4078b 100644 --- a/source/World.cpp +++ b/source/World.cpp @@ -21,6 +21,7 @@ #include "Simulator/FireSimulator.h" #include "Simulator/SandSimulator.h" #include "Simulator/RedstoneSimulator.h" +#include "Simulator/VaporizeFluidSimulator.h" // Mobs: #include "Mobs/Bat.h" @@ -2244,6 +2245,13 @@ cFluidSimulator * cWorld::InitializeFluidSimulator(cIniFile & a_IniFile, const c int NumNeighborsForSource = a_IniFile.GetValueSetI(SimulatorSectionName, "NumNeighborsForSource", IsWater ? 2 : -1); res = new cFloodyFluidSimulator(*this, a_SimulateBlock, a_StationaryBlock, Falloff, TickDelay, NumNeighborsForSource); } + else if ( + (NoCaseCompare(SimulatorName, "vaporize") == 0) || + (NoCaseCompare(SimulatorName, "vaporise") == 0) + ) + { + res = new cVaporizeFluidSimulator(*this, a_SimulateBlock, a_StationaryBlock); + } else { if (NoCaseCompare(SimulatorName, "classic") != 0)