From 5a3faa0584da196c9411f6a86cdc8aedee305659 Mon Sep 17 00:00:00 2001 From: Jacob1 Date: Thu, 15 Mar 2012 10:27:54 -0400 Subject: [PATCH] Fix ELEC being put into pmap instead of photons --- src/powder.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/powder.c b/src/powder.c index 8b1c50eec..bb0da71e4 100644 --- a/src/powder.c +++ b/src/powder.c @@ -236,7 +236,7 @@ int 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 { @@ -1066,7 +1066,7 @@ inline int create_part(int p, int x, int y, int tv)//the function for creating a //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 @@ -2609,7 +2609,7 @@ void update_particles(pixel *vid)//doesn't update the particles themselves, but y = (int)(parts[i].y+0.5f); if (x>=0 && y>=0 && x