From d62bfdaca4eb29678c5a82ff69e35965d7007640 Mon Sep 17 00:00:00 2001 From: Samuel Barney Date: Thu, 5 Dec 2013 10:01:23 -0700 Subject: [PATCH] Merged if statements. --- src/Simulator/FireSimulator.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/Simulator/FireSimulator.cpp b/src/Simulator/FireSimulator.cpp index 8e46ed320..03e4f6e45 100644 --- a/src/Simulator/FireSimulator.cpp +++ b/src/Simulator/FireSimulator.cpp @@ -136,13 +136,7 @@ void cFireSimulator::SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChun continue; } - BLOCKTYPE Burnee = E_BLOCK_AIR; - if (itr->y > 0) - { - Burnee = a_Chunk->GetBlock(itr->x, itr->y - 1, itr->z); - } - - if(!DoesBurnForever(Burnee)) + if((itr->y > 0) && (!DoesBurnForever(a_Chunk->GetBlock(itr->x, itr->y - 1, itr->z)))) { a_Chunk->SetMeta(idx, BlockMeta + 1); }