From 07bbfd58949d1155617e969651e89c8392a981c0 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Thu, 23 Oct 2014 12:51:59 +0200
Subject: Fixed a crash in redstone simulator.

---
 src/Simulator/IncrementalRedstoneSimulator.inc | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/Simulator')

diff --git a/src/Simulator/IncrementalRedstoneSimulator.inc b/src/Simulator/IncrementalRedstoneSimulator.inc
index 200fc0971..2d03584e2 100644
--- a/src/Simulator/IncrementalRedstoneSimulator.inc
+++ b/src/Simulator/IncrementalRedstoneSimulator.inc
@@ -2001,7 +2001,6 @@ bool cIncrementalRedstoneSimulator<ChunkType, WorldType, GetHandlerCompileTime,
 			// Check if western(left) neighbor is a powered on repeater who is facing us
 			if (m_Chunk->UnboundedRelGetBlock(a_RelBlockX - 1, a_RelBlockY, a_RelBlockZ, Block, OtherRepeaterDir) && (Block == E_BLOCK_REDSTONE_REPEATER_ON))
 			{
-				NIBBLETYPE OtherRepeaterDir = m_Chunk->GetMeta(a_RelBlockX -1, a_RelBlockY, a_RelBlockZ) & 0x3;
 				if ((OtherRepeaterDir & 0x03) == 0x1) 
 				{ 
 					return true; 
-- 
cgit v1.2.3


From 449d08cb3d1a8ef430430790fcea0ce36b713866 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Thu, 23 Oct 2014 15:15:10 +0200
Subject: Merged IniFile into main MCS sources.

---
 src/Simulator/SandSimulator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Simulator')

diff --git a/src/Simulator/SandSimulator.cpp b/src/Simulator/SandSimulator.cpp
index 073518b31..dfbd3e458 100644
--- a/src/Simulator/SandSimulator.cpp
+++ b/src/Simulator/SandSimulator.cpp
@@ -7,7 +7,7 @@
 #include "../Defines.h"
 #include "../Entities/FallingBlock.h"
 #include "../Chunk.h"
-#include "inifile/iniFile.h"
+#include "../IniFile.h"
 
 
 
-- 
cgit v1.2.3