summaryrefslogtreecommitdiff
path: root/src/simulation/Simulation.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-04-17 15:06:39 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-04-17 15:06:39 (GMT)
commit027833fe20dabdc49e4584a22c63c83ea8d508a3 (patch)
tree0725b5874c9d794c3203e78bebc1bc69ea82130b /src/simulation/Simulation.cpp
parent25ce83d5bff3566368f44501cd674a93b1e286e9 (diff)
downloadpowder-027833fe20dabdc49e4584a22c63c83ea8d508a3.zip
powder-027833fe20dabdc49e4584a22c63c83ea8d508a3.tar.gz
TPT Whoops, eval_move returning 1 should not allow particle creation edcf6d7b2f
Diffstat (limited to 'src/simulation/Simulation.cpp')
-rw-r--r--src/simulation/Simulation.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
index 3d0ab0e..660c723 100644
--- a/src/simulation/Simulation.cpp
+++ b/src/simulation/Simulation.cpp
@@ -1845,7 +1845,7 @@ int Simulation::create_part(int p, int x, int y, int tv)//the function for creat
return -1;
if (p==-1)//creating from anything but brush
{
- if (pmap[y][x] || (bmap[y/CELL][x/CELL] && !eval_move(t, x, y, NULL)))
+ if (pmap[y][x] || (bmap[y/CELL][x/CELL] && eval_move(t, x, y, NULL)!=2))
{
if ((pmap[y][x]&0xFF)!=PT_SPAWN&&(pmap[y][x]&0xFF)!=PT_SPAWN2)
{