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

Merge branch 'upstream' into dev

Browse Source
This commit is contained in:
jacksonmj 2011-02-18 23:14:42 +00:00
commit 32f8e85d50
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/elements/neut.c
View File

@ -72,9 +72,9 @@ int update_NEUT(UPDATE_FUNC_ARGS) {
else if ((r&0xFF)==PT_COAL && 5>(rand()%100)) else if ((r&0xFF)==PT_COAL && 5>(rand()%100))
create_part(r>>8, x+rx, y+ry, PT_WOOD); create_part(r>>8, x+rx, y+ry, PT_WOOD);
else if ((r&0xFF)==PT_DUST && 5>(rand()%100)) else if ((r&0xFF)==PT_DUST && 5>(rand()%100))
create_part(r>>8, x+rx, y+ry, PT_FWRK); part_change_type(r>>8, x+rx, y+ry, PT_FWRK);
else if ((r&0xFF)==PT_FWRK && 5>(rand()%100)) else if ((r&0xFF)==PT_FWRK && 5>(rand()%100))
create_part(r>>8, x+rx, y+ry, PT_DUST); parts[r>>8].ctype = PT_DUST;
else if ((r&0xFF)==PT_ACID && 5>(rand()%100)) else if ((r&0xFF)==PT_ACID && 5>(rand()%100))
create_part(r>>8, x+rx, y+ry, PT_ISOZ); create_part(r>>8, x+rx, y+ry, PT_ISOZ);
/*if(parts[r>>8].type>1 && parts[r>>8].type!=PT_NEUT && parts[r>>8].type-1!=PT_NEUT && parts[r>>8].type-1!=PT_STKM && /*if(parts[r>>8].type>1 && parts[r>>8].type!=PT_NEUT && parts[r>>8].type-1!=PT_NEUT && parts[r>>8].type-1!=PT_STKM &&