diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-17 16:46:44 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-04-17 16:46:44 (GMT) |
| commit | df303dc4911c55031c74d30e13a58e02b27e7068 (patch) | |
| tree | bb399905cc976ab2161273e005ee9fc7d4167d36 /src/elements/aray.cpp | |
| parent | 22381b24621c72a6cb579b4735584abe9d43b248 (diff) | |
| download | powder-df303dc4911c55031c74d30e13a58e02b27e7068.zip powder-df303dc4911c55031c74d30e13a58e02b27e7068.tar.gz | |
TPT: Allow BRAY from PSCN to pass through sparked INWR e769f3feb8
Diffstat (limited to 'src/elements/aray.cpp')
| -rw-r--r-- | src/elements/aray.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/elements/aray.cpp b/src/elements/aray.cpp index 844b549..f1fe0f6 100644 --- a/src/elements/aray.cpp +++ b/src/elements/aray.cpp @@ -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; |