summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-11-19 08:49:02 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-11-19 08:49:02 +0100
commitf06d686f63ea564ea4a6ad9eadacf575d1e2c336 (patch)
tree3df2f07ecb50b7a5c2aa2b9e5d5047b743399546
parentRedstone Megacommit [SEE DESC] (diff)
downloadcuberite-f06d686f63ea564ea4a6ad9eadacf575d1e2c336.tar
cuberite-f06d686f63ea564ea4a6ad9eadacf575d1e2c336.tar.gz
cuberite-f06d686f63ea564ea4a6ad9eadacf575d1e2c336.tar.bz2
cuberite-f06d686f63ea564ea4a6ad9eadacf575d1e2c336.tar.lz
cuberite-f06d686f63ea564ea4a6ad9eadacf575d1e2c336.tar.xz
cuberite-f06d686f63ea564ea4a6ad9eadacf575d1e2c336.tar.zst
cuberite-f06d686f63ea564ea4a6ad9eadacf575d1e2c336.zip
-rw-r--r--source/Blocks/BlockTorch.h2
-rw-r--r--source/Simulator/RedstoneSimulator.cpp2
2 files changed, 1 insertions, 3 deletions
diff --git a/source/Blocks/BlockTorch.h b/source/Blocks/BlockTorch.h
index 36383a524..72a313126 100644
--- a/source/Blocks/BlockTorch.h
+++ b/source/Blocks/BlockTorch.h
@@ -169,8 +169,6 @@ public:
virtual bool CanBeAt(int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override
{
char Face = MetaDataToDirection(a_Chunk.GetMeta(a_RelX, a_RelY, a_RelZ));
- int BlockX = a_RelX + a_Chunk.GetPosX() * cChunkDef::Width;
- int BlockZ = a_RelZ + a_Chunk.GetPosZ() * cChunkDef::Width;
AddFaceDirection(a_RelX, a_RelY, a_RelZ, Face, true);
BLOCKTYPE BlockInQuestion;
diff --git a/source/Simulator/RedstoneSimulator.cpp b/source/Simulator/RedstoneSimulator.cpp
index 29f59fa53..906961490 100644
--- a/source/Simulator/RedstoneSimulator.cpp
+++ b/source/Simulator/RedstoneSimulator.cpp
@@ -76,7 +76,7 @@ void cRedstoneSimulator::SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, c
int BaseX = a_Chunk->GetPosX() * cChunkDef::Width;
int BaseZ = a_Chunk->GetPosZ() * cChunkDef::Width;
- for (cRedstoneSimulatorChunkData::const_iterator dataitr = ChunkData.begin(), end = ChunkData.end(); dataitr != end;)
+ for (cRedstoneSimulatorChunkData::iterator dataitr = ChunkData.begin(), end = ChunkData.end(); dataitr != end;)
{
BLOCKTYPE BlockType = a_Chunk->GetBlock(dataitr->x, dataitr->y, dataitr->z);
if (!IsAllowedBlock(BlockType))