From 6be1b869e5eb96332b7f3569f388f14644afb8ee Mon Sep 17 00:00:00 2001 From: Simon Robertshaw Date: Wed, 18 Apr 2012 19:20:04 +0100 Subject: [PATCH] TPT: Fix ELEC being put into pmap instead of photons 5a3faa0584 --- src/simulation/Simulation.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index 19215fd77..1d24d2b00 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