diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-18 18:20:04 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-18 18:20:04 (GMT) |
| commit | 6be1b869e5eb96332b7f3569f388f14644afb8ee (patch) | |
| tree | 87d29494932624fa8fe3bdef041ba2375833be62 /src/simulation/Simulation.cpp | |
| parent | f55fc54f6e704d53d633aa855e45aa9417ff176a (diff) | |
| download | powder-6be1b869e5eb96332b7f3569f388f14644afb8ee.zip powder-6be1b869e5eb96332b7f3569f388f14644afb8ee.tar.gz | |
TPT: Fix ELEC being put into pmap instead of photons 5a3faa0584
Diffstat (limited to 'src/simulation/Simulation.cpp')
| -rw-r--r-- | src/simulation/Simulation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index 19215fd..1d24d2b 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -1320,7 +1320,7 @@ int Simulation::try_move(int i, int x, int y, int nx, int ny) if (!e) //if no movement { - if (parts[i].type!=PT_NEUT && parts[i].type!=PT_PHOT) + if (parts[i].type!=PT_NEUT && parts[i].type!=PT_PHOT && parts[i].type!=PT_ELEC) return 0; if (!legacy_enable && parts[i].type==PT_PHOT && r)//PHOT heat conduction { @@ -2162,7 +2162,7 @@ int Simulation::create_part(int p, int x, int y, int tv)//the function for creat //and finally set the pmap/photon maps to the newly created particle if (t==PT_PHOT||t==PT_NEUT||t==PT_ELEC) photons[y][x] = t|(i<<8); - if (t!=PT_STKM&&t!=PT_STKM2 && t!=PT_FIGH && t!=PT_PHOT && t!=PT_NEUT) + else if (t!=PT_STKM && t!=PT_STKM2 && t!=PT_FIGH) pmap[y][x] = t|(i<<8); //Fancy dust effects for powder types @@ -3380,7 +3380,7 @@ void Simulation::update_particles()//doesn't update the particles themselves, bu y = (int)(parts[i].y+0.5f); if (x>=0 && y>=0 && x<XRES && y<YRES) { - if (t==PT_PHOT||t==PT_NEUT) + if (t==PT_PHOT||t==PT_NEUT||t==PT_ELEC) photons[y][x] = t|(i<<8); else pmap[y][x] = t|(i<<8); |