diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-18 15:14:10 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-18 15:14:10 (GMT) |
| commit | a761fa5cbce65f303a068e6587dd8ef891468fcb (patch) | |
| tree | 5073c7eb2c57bb1712115a7ad5f2686aac9d7d3a /src/simulation/Simulation.cpp | |
| parent | 2ca07515c1367e31999d71c82982aa232e206acb (diff) | |
| download | powder-a761fa5cbce65f303a068e6587dd8ef891468fcb.zip powder-a761fa5cbce65f303a068e6587dd8ef891468fcb.tar.gz | |
TPT: Remove 2 pixels per frame speed limit in detector wall b4a06df0b2
Diffstat (limited to 'src/simulation/Simulation.cpp')
| -rw-r--r-- | src/simulation/Simulation.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index d85866a..7941d25 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -2952,7 +2952,7 @@ killed: clear_y = (int)(clear_yf+0.5f); break; } - if (fin_x<CELL || fin_y<CELL || fin_x>=XRES-CELL || fin_y>=YRES-CELL || pmap[fin_y][fin_x] || (bmap[fin_y/CELL][fin_x/CELL] && (bmap[fin_y/CELL][fin_x/CELL]==WL_DESTROYALL || bmap[fin_y/CELL][fin_x/CELL]==WL_DETECT || !eval_move(t,fin_x,fin_y,NULL)))) + if (fin_x<CELL || fin_y<CELL || fin_x>=XRES-CELL || fin_y>=YRES-CELL || pmap[fin_y][fin_x] || (bmap[fin_y/CELL][fin_x/CELL] && (bmap[fin_y/CELL][fin_x/CELL]==WL_DESTROYALL || !eval_move(t,fin_x,fin_y,NULL)))) { // found an obstacle clear_xf = fin_xf-dx; @@ -2961,7 +2961,8 @@ killed: clear_y = (int)(clear_yf+0.5f); break; } - + if (bmap[fin_y/CELL][fin_x/CELL]==WL_DETECT && emap[fin_y/CELL][fin_x/CELL]<8) + set_emap(fin_x/CELL, fin_y/CELL); } } |