From 3d9396b097626dc81740b61f9552733c57201bf0 Mon Sep 17 00:00:00 2001 From: Samuel Barney Date: Thu, 5 Dec 2013 07:34:56 -0700 Subject: Finished Merge --- src/Simulator/FireSimulator.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Simulator/FireSimulator.h b/src/Simulator/FireSimulator.h index 59cc62540..66c31b440 100644 --- a/src/Simulator/FireSimulator.h +++ b/src/Simulator/FireSimulator.h @@ -27,8 +27,8 @@ public: virtual bool IsAllowedBlock(BLOCKTYPE a_BlockType) override; - bool IsFuel (BLOCKTYPE a_BlockType); - bool DoesBurnForever(BLOCKTYPE a_BlockType); + static bool IsFuel (BLOCKTYPE a_BlockType); + static bool DoesBurnForever(BLOCKTYPE a_BlockType); protected: /// Time (in msec) that a fire block takes to burn with a fuel block into the next step -- cgit v1.2.3