diff options
| author | jacob1 <jfu614@gmail.com> | 2013-02-22 04:35:44 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-02-22 04:35:44 (GMT) |
| commit | 3da733b0270dd36b0515896e80d861e4ab7496d1 (patch) | |
| tree | 7f75eccbdba3dd32cec0e7294d8663749fb16ad4 /src/simulation/Simulation.cpp | |
| parent | 2184d35b28a42358ed232b7c448e7462e403e172 (diff) | |
| download | powder-3da733b0270dd36b0515896e80d861e4ab7496d1.zip powder-3da733b0270dd36b0515896e80d861e4ab7496d1.tar.gz | |
fix PSTN bugs where FRME would still move even if all of it couldn't, fix PSTN going through walls, fix bug where the PSTN extention may not be created in some glitched cases
Diffstat (limited to 'src/simulation/Simulation.cpp')
| -rw-r--r-- | src/simulation/Simulation.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index 0780bea..d8b19bc 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -1996,11 +1996,8 @@ void Simulation::clear_sim(void) SetEdgeMode(edgeMode); } -bool Simulation::IsObsticle(int x, int y, int type) +bool Simulation::IsWallBlocking(int x, int y, int type) { - if (pmap[y][x])// && (type != PT_SPRK || !(elements[pmap[y][x]&0xFF].Properties & PROP_CONDUCTS))) - return true; - if (bmap[y/CELL][x/CELL]) { int wall = bmap[y/CELL][x/CELL]; |