diff options
| author | jacksonmj <jacksonmj@jacksonmj.none> | 2011-01-11 13:44:52 (GMT) |
|---|---|---|
| committer | jacksonmj <jacksonmj@jacksonmj.none> | 2011-01-11 13:44:52 (GMT) |
| commit | 4006bdf4c22564e916092d6d63ae63d1fa6bc5b5 (patch) | |
| tree | 5cbe9ad22685a055f4d7849bd52afa0f9ab87f8d /src/elements/aray.c | |
| parent | cf1ef725847a5dc5c9e796a10ff840f65dc1e885 (diff) | |
| parent | b3735bb84b5d53014e7e20085007ef380cc7a3c1 (diff) | |
| download | powder-4006bdf4c22564e916092d6d63ae63d1fa6bc5b5.zip powder-4006bdf4c22564e916092d6d63ae63d1fa6bc5b5.tar.gz | |
Merge branch 'upstream' into dev
Diffstat (limited to 'src/elements/aray.c')
| -rw-r--r-- | src/elements/aray.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/elements/aray.c b/src/elements/aray.c index 136158a..a931b1a 100644 --- a/src/elements/aray.c +++ b/src/elements/aray.c @@ -44,7 +44,7 @@ int update_ARAY(UPDATE_FUNC_ARGS) { } else if ((r&0xFF)==PT_FILT) { colored = parts[r>>8].ctype; - } else if ((r&0xFF)!=PT_INWR && (r&0xFF)!=PT_ARAY && (r&0xFF)!=PT_WIFI) { + } else if ((r&0xFF)!=PT_INWR && (r&0xFF)!=PT_ARAY && (r&0xFF)!=PT_WIFI && !((r&0xFF)==PT_SWCH && parts[r>>8].life>=10)) { if (nyy!=0 || nxx!=0) { create_part(-1, x+nxi+nxx, y+nyi+nyy, PT_SPRK); } @@ -58,7 +58,7 @@ int update_ARAY(UPDATE_FUNC_ARGS) { if (parts[r>>8].type==PT_BRAY) { parts[r>>8].life = 1; docontinue = 1; - } else if (parts[r>>8].type==PT_INWR || parts[r>>8].type==PT_ARAY || parts[r>>8].type==PT_WIFI) { + } else if (parts[r>>8].type==PT_INWR || parts[r>>8].type==PT_ARAY || parts[r>>8].type==PT_WIFI || parts[r>>8].type==PT_FILT || (parts[r>>8].type==PT_SWCH && parts[r>>8].life>=10)) { docontinue = 1; } else { docontinue = 0; |