diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-06-13 00:06:44 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-06-13 00:06:44 (GMT) |
| commit | a4d156fc6b92ce2ac6739b5b7ffded05bcf2b0a9 (patch) | |
| tree | 35b8fc428e04691cfbe6b7dd09853e1c31a17368 /src/simulation/Simulation.cpp | |
| parent | 59920c1a622f507b63c3e6308c376287c33ced58 (diff) | |
| download | powder-a4d156fc6b92ce2ac6739b5b7ffded05bcf2b0a9.zip powder-a4d156fc6b92ce2ac6739b5b7ffded05bcf2b0a9.tar.gz | |
TPT: Prevent solid particles stacking in E-Hole
Diffstat (limited to 'src/simulation/Simulation.cpp')
| -rw-r--r-- | src/simulation/Simulation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index 9d20582..2588ad7 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -1865,7 +1865,7 @@ int Simulation::eval_move(int pt, int nx, int ny, unsigned *rr) return 0; if (bmap[ny/CELL][nx/CELL]==WL_EWALL && !emap[ny/CELL][nx/CELL]) return 0; - if (bmap[ny/CELL][nx/CELL]==WL_EHOLE && !emap[ny/CELL][nx/CELL]) + if (bmap[ny/CELL][nx/CELL]==WL_EHOLE && !emap[ny/CELL][nx/CELL] && !(elements[pt].Properties&TYPE_SOLID) && !(elements[r&0xFF].Properties&TYPE_SOLID)) return 2; } return result; |