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

Merge branch 'master' of github.com:FacialTurd/PowderToypp

Browse Source
This commit is contained in:
Simon Robertshaw 2012-11-03 12:22:07 +00:00
commit bd473f02ca
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/simulation/Simulation.cpp
View File

@ -1977,7 +1977,7 @@ void Simulation::init_can_move()
can_move[PT_STKM2][t] = stkm_move;
can_move[PT_FIGH][t] = stkm_move;
}
for (t=0;t<PT_NUM;t++)
for (t=1;t<PT_NUM;t++)
{
// make them eat things
can_move[t][PT_BHOL] = 1;
@ -1992,6 +1992,8 @@ void Simulation::init_can_move()
//void behaviour varies with powered state and ctype
can_move[t][PT_PVOD] = 3;
can_move[t][PT_VOID] = 3;
can_move[t][PT_EMBR] = 0;
can_move[PT_EMBR][t] = 0;
}
for (t=0;t<PT_NUM;t++)
{
@ -4600,7 +4602,7 @@ void Simulation::update_particles()//doesn't update the particles themselves, bu
if (!pmap[y][x] || (t!=PT_INVIS && t!= PT_FILT))
pmap[y][x] = t|(i<<8);
// (there are a few exceptions, including energy particles - currently no limit on stacking those)
if (t!=PT_THDR && t!=PT_EMBR && t!=PT_FIGH)
if (t!=PT_THDR && t!=PT_EMBR && t!=PT_FIGH && t!=PT_PLSM)
pmap_count[y][x]++;
}
}