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

TPT: Fix ELEC being put into pmap instead of photons 5a3faa0584

Browse Source
This commit is contained in:
Simon Robertshaw 2012-04-18 19:20:04 +01:00
parent f55fc54f6e
commit 6be1b869e5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/simulation/Simulation.cpp
View File

@ -1320,7 +1320,7 @@ int Simulation::try_move(int i, int x, int y, int nx, int ny)
if (!e) //if no movement 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; return 0;
if (!legacy_enable && parts[i].type==PT_PHOT && r)//PHOT heat conduction 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 //and finally set the pmap/photon maps to the newly created particle
if (t==PT_PHOT||t==PT_NEUT||t==PT_ELEC) if (t==PT_PHOT||t==PT_NEUT||t==PT_ELEC)
photons[y][x] = t|(i<<8); 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); pmap[y][x] = t|(i<<8);
//Fancy dust effects for powder types //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); y = (int)(parts[i].y+0.5f);
if (x>=0 && y>=0 && x<XRES && y<YRES) 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); photons[y][x] = t|(i<<8);
else else
pmap[y][x] = t|(i<<8); pmap[y][x] = t|(i<<8);