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

TPT: Avoid stacking in INVS and FILT, and fix pressurised INVS graphics

Browse Source
This commit is contained in:
Simon Robertshaw 2012-06-13 01:28:00 +01:00
parent 2aebc294e8
commit 5f81b70787
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/simulation/Simulation.cpp
View File

@ -2988,6 +2988,7 @@ void Simulation::update_particles_i(int start, int inc)
create_part(i, x, y, PT_NBHL);
parts[i].temp = MAX_TEMP;
parts[i].tmp = pmap_count[y][x]-NPART;//strength of grav field
if (parts[i].tmp>51200) parts[i].tmp = 51200;
pmap_count[y][x] = NPART;
}
else
@ -4151,7 +4152,10 @@ void Simulation::update_particles()//doesn't update the particles themselves, bu
photons[y][x] = t|(i<<8);
else
{
pmap[y][x] = t|(i<<8);
// Particles are sometimes allowed to go inside INVS and FILT
// To make particles collide correctly when inside these elements, these elements must not overwrite an existing pmap entry from particles inside them
if (!pmap[y][x] || (t!=PT_INVIS && t!= PT_FILT))
pmap[y][x] = t|(i<<8);
pmap_count[y][x]++;
}
}

5
src/simulation/elements/INVIS.cpp
View File

@ -57,11 +57,10 @@ int Element_INVIS::graphics(GRAPHICS_FUNC_ARGS)
*colr = 15;
*colg = 0;
*colb = 150;
*pixel_mode &= PMODE;
*pixel_mode |= PMODE_BLEND;
*pixel_mode = PMODE_BLEND;
}
return 0;
}
Element_INVIS::~Element_INVIS() {}
Element_INVIS::~Element_INVIS() {}