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

Make PIPE detach SOAP particles (crash fix)

Browse Source
This commit is contained in:
jacksonmj 2011-12-13 17:04:56 +08:00 committed by Simon Robertshaw
parent 2015499ff1
commit 46068833d1
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/elements/pipe.c
View File

@ -147,6 +147,8 @@ int update_PIPE(UPDATE_FUNC_ARGS) {
//try eating particle at entrance //try eating particle at entrance
else if ((parts[i].tmp&0xFF) == 0 && (ptypes[r&0xFF].falldown!= 0 || ptypes[r&0xFF].state == ST_GAS)) else if ((parts[i].tmp&0xFF) == 0 && (ptypes[r&0xFF].falldown!= 0 || ptypes[r&0xFF].state == ST_GAS))
{ {
if ((r&0xFF)==PT_SOAP)
detach(r>>8);
parts[i].tmp = (parts[i].tmp&~0xFF) | parts[r>>8].type; parts[i].tmp = (parts[i].tmp&~0xFF) | parts[r>>8].type;
parts[i].temp = parts[r>>8].temp; parts[i].temp = parts[r>>8].temp;
parts[i].flags = parts[r>>8].life; parts[i].flags = parts[r>>8].life;