From 225c2fa9f6bc2ebffcc9160090482e6833a220ce Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Wed, 29 Jul 2020 01:18:59 +0100 Subject: Always use relative coordinates in AddBlock + Pass block, use relatives * Fixes everything immediately converting abs back to rel and getting block, when these data were already available --- src/Simulator/FireSimulator.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/Simulator/FireSimulator.h') diff --git a/src/Simulator/FireSimulator.h b/src/Simulator/FireSimulator.h index 1bc6e7c0b..1e9b0b6d7 100644 --- a/src/Simulator/FireSimulator.h +++ b/src/Simulator/FireSimulator.h @@ -19,18 +19,19 @@ class cFireSimulator : public cSimulator { public: + cFireSimulator(cWorld & a_World, cIniFile & a_IniFile); - virtual ~cFireSimulator() override; + + static bool IsFuel (BLOCKTYPE a_BlockType); + static bool DoesBurnForever(BLOCKTYPE a_BlockType); + +private: virtual void Simulate(float a_Dt) override { UNUSED(a_Dt);} // not used virtual void SimulateChunk(std::chrono::milliseconds a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override; - virtual bool IsAllowedBlock(BLOCKTYPE a_BlockType) override; - - static bool IsFuel (BLOCKTYPE a_BlockType); - static bool DoesBurnForever(BLOCKTYPE a_BlockType); + static bool IsAllowedBlock(BLOCKTYPE a_BlockType); -protected: /** Time (in msec) that a fire block takes to burn with a fuel block into the next step */ unsigned m_BurnStepTimeFuel; -- cgit v1.2.3