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

Added a Noop fluid simulator that doesn't do anything with the fluid (fluid doesn't spread at all, behaves like a normal block)

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1272 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2013-03-14 20:03:42 +00:00
parent 7f71bfb58f
commit 68b1aa23b0
3 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
VC2008/MCServer.vcproj
View File

@ -1106,6 +1106,10 @@
RelativePath="..\source\Simulator\FluidSimulator.h"
>
</File>
<File
RelativePath="..\source\Simulator\NoopFluidSimulator.h"
>
</File>
<File
RelativePath="..\source\Simulator\RedstoneSimulator.cpp"
>

36
source/Simulator/NoopFluidSimulator.h Normal file
View File

@ -0,0 +1,36 @@
// NoopFluidSimulator.h
// Declares the cNoopFluidSimulator class representing a fluid simulator that performs nothing, it ignores all blocks
#pragma once
#include "FluidSimulator.h"
class cNoopFluidSimulator :
public cFluidSimulator
{
typedef cFluidSimulator super;
public:
cNoopFluidSimulator(cWorld & a_World, BLOCKTYPE a_Fluid, BLOCKTYPE a_StationaryFluid) :
super(a_World, a_Fluid, 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 {}
} ;

10
source/World.cpp
View File

@ -19,6 +19,7 @@
#include "Simulator/FloodyFluidSimulator.h"
#include "Simulator/FluidSimulator.h"
#include "Simulator/FireSimulator.h"
#include "Simulator/NoopFluidSimulator.h"
#include "Simulator/SandSimulator.h"
#include "Simulator/RedstoneSimulator.h"
#include "Simulator/VaporizeFluidSimulator.h"
@ -2252,6 +2253,15 @@ cFluidSimulator * cWorld::InitializeFluidSimulator(cIniFile & a_IniFile, const c
{
res = new cVaporizeFluidSimulator(*this, a_SimulateBlock, a_StationaryBlock);
}
else if (
(NoCaseCompare(SimulatorName, "noop") == 0) ||
(NoCaseCompare(SimulatorName, "nop") == 0) ||
(NoCaseCompare(SimulatorName, "null") == 0) ||
(NoCaseCompare(SimulatorName, "nil") == 0)
)
{
res = new cNoopFluidSimulator(*this, a_SimulateBlock, a_StationaryBlock);
}
else
{
if (NoCaseCompare(SimulatorName, "classic") != 0)