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

TPT: Make VOID and BHOL eat stickmen again 1f4f50682c

Browse Source
This commit is contained in:
Simon Robertshaw 2012-07-25 18:27:08 +01:00
parent 41cbd69ac8
commit 1e5eba3583
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/simulation/elements/STKM.cpp
View File

@ -510,6 +510,18 @@ void Element_STKM::STKM_interact(Simulation * sim, playerst* playerp, int i, int
break;
}
}
if (((r&0xFF)==PT_BHOL || (r&0xFF)==PT_NBHL) && parts[i].type)
{
if (!sim->legacy_enable)
{
parts[r>>8].temp = restrict_flt(parts[r>>8].temp+parts[i].temp/2, MIN_TEMP, MAX_TEMP);
}
sim->kill_part(i);
}
if (((r&0xFF)==PT_VOID || ((r&0xFF)==PT_PVOD && parts[r>>8].life==10)) && (!parts[r>>8].ctype || (parts[r>>8].ctype==parts[i].type)!=(parts[r>>8].tmp&1)) && parts[i].type)
{
sim->kill_part(i);
}
}
}