summaryrefslogtreecommitdiff
path: root/src/elements/neut.c
diff options
context:
space:
mode:
authorjacksonmj <jacksonmj@jacksonmj.none>2011-01-11 13:44:52 (GMT)
committer jacksonmj <jacksonmj@jacksonmj.none>2011-01-11 13:44:52 (GMT)
commit4006bdf4c22564e916092d6d63ae63d1fa6bc5b5 (patch)
tree5cbe9ad22685a055f4d7849bd52afa0f9ab87f8d /src/elements/neut.c
parentcf1ef725847a5dc5c9e796a10ff840f65dc1e885 (diff)
parentb3735bb84b5d53014e7e20085007ef380cc7a3c1 (diff)
downloadpowder-4006bdf4c22564e916092d6d63ae63d1fa6bc5b5.zip
powder-4006bdf4c22564e916092d6d63ae63d1fa6bc5b5.tar.gz
Merge branch 'upstream' into dev
Diffstat (limited to 'src/elements/neut.c')
-rw-r--r--src/elements/neut.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/elements/neut.c b/src/elements/neut.c
index 61511d1..564b74c 100644
--- a/src/elements/neut.c
+++ b/src/elements/neut.c
@@ -57,12 +57,8 @@ int update_NEUT(UPDATE_FUNC_ARGS) {
part_change_type(i,x,y,PT_DUST);
else if ((r&0xFF)==PT_DYST && 15>(rand()%1000))
part_change_type(i,x,y,PT_YEST);
- else if ((r&0xFF)==PT_YEST) {
- if (15>(rand()%100000)&&isplayer==0)
- create_part(r>>8, x+rx, y+ry, PT_STKM);
- else
- part_change_type(i,x,y,PT_DYST);
- }
+ else if ((r&0xFF)==PT_YEST)
+ part_change_type(i,x,y,PT_DYST);
else if ((r&0xFF)==PT_WATR && 15>(rand()%100))
part_change_type(r>>8,x+rx,y+ry,PT_DSTW);
else if ((r&0xFF)==PT_PLEX && 15>(rand()%1000))