diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-02-18 23:14:42 (GMT) |
|---|---|---|
| committer | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-02-18 23:14:42 (GMT) |
| commit | 32f8e85d504e1510682cf60666b3bb10c52cf58e (patch) | |
| tree | fbc69bcf3810cf3222dff35c9f76a52a7dae49f7 /src | |
| parent | 914cf28fa7b68d0d487e39f4a4a9747942f739ea (diff) | |
| parent | 72e6fdd9f645e2d490fba7dd520851314b161cab (diff) | |
| download | powder-32f8e85d504e1510682cf60666b3bb10c52cf58e.zip powder-32f8e85d504e1510682cf60666b3bb10c52cf58e.tar.gz | |
Merge branch 'upstream' into dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/elements/neut.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/elements/neut.c b/src/elements/neut.c index aa3ddf0..a97701d 100644 --- a/src/elements/neut.c +++ b/src/elements/neut.c @@ -72,9 +72,9 @@ int update_NEUT(UPDATE_FUNC_ARGS) { else if ((r&0xFF)==PT_COAL && 5>(rand()%100)) create_part(r>>8, x+rx, y+ry, PT_WOOD); 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)) - 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)) 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 && |