matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix particle #0 not being removed from the photons map when moving

Browse Source
This commit is contained in:
jacob1 2018-09-09 10:53:02 -04:00
parent 3707ecd563
commit 7f215a6a17
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/simulation/Simulation.cpp
View File

@ -2726,9 +2726,12 @@ int Simulation::do_move(int i, int x, int y, float nxf, float nyf)
parts[i].y = nyf;
if (ny!=y || nx!=x)
{
if (ID(pmap[y][x])==i) pmap[y][x] = 0;
else if (ID(photons[y][x])==i) photons[y][x] = 0;
if (nx<CELL || nx>=XRES-CELL || ny<CELL || ny>=YRES-CELL)//kill_part if particle is out of bounds
if (ID(pmap[y][x]) == i)
pmap[y][x] = 0;
if (ID(photons[y][x]) == i)
photons[y][x] = 0;
// kill_part if particle is out of bounds
if (nx < CELL || nx >= XRES - CELL || ny < CELL || ny >= YRES - CELL)
{
kill_part(i);
return -1;