summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-01-29 20:19:14 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-01-29 20:19:14 +0100
commited7816419d2b1d2ddd3a371efb4276ca67dfb4d8 (patch)
tree2ca44bb44d1631c35617557fd8746b882f34b688 /src
parentMerge pull request #599 from tonibm19/master (diff)
downloadcuberite-ed7816419d2b1d2ddd3a371efb4276ca67dfb4d8.tar
cuberite-ed7816419d2b1d2ddd3a371efb4276ca67dfb4d8.tar.gz
cuberite-ed7816419d2b1d2ddd3a371efb4276ca67dfb4d8.tar.bz2
cuberite-ed7816419d2b1d2ddd3a371efb4276ca67dfb4d8.tar.lz
cuberite-ed7816419d2b1d2ddd3a371efb4276ca67dfb4d8.tar.xz
cuberite-ed7816419d2b1d2ddd3a371efb4276ca67dfb4d8.tar.zst
cuberite-ed7816419d2b1d2ddd3a371efb4276ca67dfb4d8.zip
Diffstat (limited to '')
-rw-r--r--src/ChunkDef.h16
-rw-r--r--src/Simulator/RedstoneSimulator.cpp25
-rw-r--r--src/Simulator/RedstoneSimulator.h2
3 files changed, 25 insertions, 18 deletions
diff --git a/src/ChunkDef.h b/src/ChunkDef.h
index d1288994c..13933e6f1 100644
--- a/src/ChunkDef.h
+++ b/src/ChunkDef.h
@@ -499,13 +499,14 @@ public:
/// Generic template that can store any kind of data together with a triplet of 3 coords:
-template <typename X> class cCoordWithData
+template <typename X, typename Y> class cCoordWithData
{
public:
int x;
int y;
int z;
X Data;
+ Y SecondData;
cCoordWithData(int a_X, int a_Y, int a_Z) :
x(a_X), y(a_Y), z(a_Z)
@@ -516,14 +517,19 @@ public:
x(a_X), y(a_Y), z(a_Z), Data(a_Data)
{
}
+
+ cCoordWithData(int a_X, int a_Y, int a_Z, const X & a_Data, const Y & a_SecondData) :
+ x(a_X), y(a_Y), z(a_Z), Data(a_Data), SecondData(a_SecondData)
+ {
+ }
} ;
-// Illegal in C++03: typedef std::list< cCoordWithData<X> > cCoordWithDataList<X>;
-typedef cCoordWithData<int> cCoordWithInt;
-typedef cCoordWithData<BLOCKTYPE> cCoordWithBlock;
+typedef cCoordWithData<int, void *> cCoordWithInt;
+typedef cCoordWithData<BLOCKTYPE, bool> cCoordWithBlockAndBool;
+
typedef std::list<cCoordWithInt> cCoordWithIntList;
typedef std::vector<cCoordWithInt> cCoordWithIntVector;
-typedef std::vector<cCoordWithBlock> cCoordWithBlockVector;
+typedef std::vector<cCoordWithBlockAndBool> cCoordWithBlockAndBoolVector;
diff --git a/src/Simulator/RedstoneSimulator.cpp b/src/Simulator/RedstoneSimulator.cpp
index e361cbf49..357643ecc 100644
--- a/src/Simulator/RedstoneSimulator.cpp
+++ b/src/Simulator/RedstoneSimulator.cpp
@@ -9,7 +9,6 @@
#include "../Blocks/BlockTorch.h"
#include "../Blocks/BlockDoor.h"
#include "../Piston.h"
-#include "../Tracer.h"
@@ -170,7 +169,7 @@ void cRedstoneSimulator::AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, cChu
{
if (!IsAllowedBlock(Block))
{
- ChunkData.erase(itr); // The new blocktype is not redstone; it must be removed from this list
+ itr->SecondData = true; // The new blocktype is not redstone; it must be queued to be removed from this list
}
else
{
@@ -185,7 +184,7 @@ void cRedstoneSimulator::AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, cChu
return;
}
- ChunkData.push_back(cCoordWithBlock(RelX, a_BlockY, RelZ, Block));
+ ChunkData.push_back(cCoordWithBlockAndBool(RelX, a_BlockY, RelZ, Block, false));
}
@@ -208,8 +207,14 @@ 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(); dataitr != ChunkData.end(); ++dataitr)
+ for (cRedstoneSimulatorChunkData::iterator dataitr = ChunkData.begin(); dataitr != ChunkData.end();)
{
+ if (dataitr->SecondData)
+ {
+ dataitr = ChunkData.erase(dataitr);
+ continue;
+ }
+
int a_X = BaseX + dataitr->x;
int a_Z = BaseZ + dataitr->z;
switch (dataitr->Data)
@@ -279,6 +284,7 @@ void cRedstoneSimulator::SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, c
break;
}
}
+ ++dataitr;
}
}
@@ -917,7 +923,7 @@ void cRedstoneSimulator::HandlePressurePlate(int a_BlockX, int a_BlockY, int a_B
case E_BLOCK_STONE_PRESSURE_PLATE:
{
// MCS feature - stone pressure plates can only be triggered by players :D
- cPlayer * a_Player = m_World.FindClosestPlayer(Vector3f(a_BlockX + 0.5f, (float)a_BlockY, a_BlockZ + 0.5f), 0.5f);
+ cPlayer * a_Player = m_World.FindClosestPlayer(Vector3f(a_BlockX + 0.5f, (float)a_BlockY, a_BlockZ + 0.5f), 0.5f, false);
if (a_Player != NULL)
{
@@ -948,19 +954,14 @@ void cRedstoneSimulator::HandlePressurePlate(int a_BlockX, int a_BlockY, int a_B
virtual bool Item(cEntity * a_Entity) override
{
- cTracer LineOfSight(m_World);
-
Vector3f EntityPos = a_Entity->GetPosition();
Vector3f BlockPos(m_X + 0.5f, (float)m_Y, m_Z + 0.5f);
float Distance = (EntityPos - BlockPos).Length();
if (Distance < 0.5)
{
- if (!LineOfSight.Trace(BlockPos, (EntityPos - BlockPos), (int)(EntityPos - BlockPos).Length()))
- {
- m_Entity = a_Entity;
- return true; // Break out, we only need to know for wooden plates that at least one entity is on top
- }
+ m_Entity = a_Entity;
+ return true; // Break out, we only need to know for wooden plates that at least one entity is on top
}
return false;
}
diff --git a/src/Simulator/RedstoneSimulator.h b/src/Simulator/RedstoneSimulator.h
index bb2efeb8a..c505b2a0f 100644
--- a/src/Simulator/RedstoneSimulator.h
+++ b/src/Simulator/RedstoneSimulator.h
@@ -4,7 +4,7 @@
#include "Simulator.h"
/// Per-chunk data for the simulator, specified individual chunks to simulate; 'Data' is not used
-typedef cCoordWithBlockVector cRedstoneSimulatorChunkData;
+typedef cCoordWithBlockAndBoolVector cRedstoneSimulatorChunkData;