diff options
| author | Jacob1 <jfu614@gmail.com> | 2012-03-15 14:27:54 (GMT) |
|---|---|---|
| committer | jacksonmj <mj-pt@jacksonmj.co.uk> | 2012-03-26 15:18:13 (GMT) |
| commit | 5a3faa0584da196c9411f6a86cdc8aedee305659 (patch) | |
| tree | acf95d901421d414bff92fb13cfd6cf56bb0f0cb /src | |
| parent | 2d1c5696a4e7fb8b887bd213eb2ce9ff3b7322e9 (diff) | |
| download | powder-5a3faa0584da196c9411f6a86cdc8aedee305659.zip powder-5a3faa0584da196c9411f6a86cdc8aedee305659.tar.gz | |
Fix ELEC being put into pmap instead of photons
Diffstat (limited to 'src')
| -rw-r--r-- | src/powder.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/powder.c b/src/powder.c index 8b1c50e..bb0da71 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<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); |