diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2012-02-16 21:39:29 (GMT) |
|---|---|---|
| committer | jacksonmj <mj-pt@jacksonmj.co.uk> | 2012-02-16 21:39:29 (GMT) |
| commit | e769f3feb828a2d5ecc6bf58e679d5ac0561b961 (patch) | |
| tree | 1fe1a5fb69f99e61e78ab4d23acc1241d396ae9f /src/elements | |
| parent | 9001508623471c20abd5bce8a025f3b10b87b205 (diff) | |
| download | powder-e769f3feb828a2d5ecc6bf58e679d5ac0561b961.zip powder-e769f3feb828a2d5ecc6bf58e679d5ac0561b961.tar.gz | |
Allow BRAY from PSCN to pass through sparked INWR
(it currently passes through INWR only when not sparked)
Diffstat (limited to 'src/elements')
| -rw-r--r-- | src/elements/aray.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/elements/aray.c b/src/elements/aray.c index 85f59e3..c1a1bf4 100644 --- a/src/elements/aray.c +++ b/src/elements/aray.c @@ -84,7 +84,7 @@ int update_ARAY(UPDATE_FUNC_ARGS) { parts[r>>8].life = 1; docontinue = 1; //this if prevents red BRAY from stopping on certain materials - } else if ((r&0xFF)==PT_STOR || (r&0xFF)==PT_INWR || (r&0xFF)==PT_ARAY || (r&0xFF)==PT_WIFI || (r&0xFF)==PT_FILT || ((r&0xFF)==PT_SWCH && parts[r>>8].life>=10)) { + } else if ((r&0xFF)==PT_STOR || (r&0xFF)==PT_INWR || ((r&0xFF)==PT_SPRK && parts[r>>8].ctype==PT_INWR) || (r&0xFF)==PT_ARAY || (r&0xFF)==PT_WIFI || (r&0xFF)==PT_FILT || ((r&0xFF)==PT_SWCH && parts[r>>8].life>=10)) { if((r&0xFF)==PT_STOR) { parts[r>>8].tmp = 0; |