diff options
| author | jacob1 <jfu614@gmail.com> | 2013-02-01 19:29:18 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-02-01 19:29:18 (GMT) |
| commit | 8e02443f0a294fcec9bcc8678dcf8b61f0d56f99 (patch) | |
| tree | 817b9604767f046f8abe08f6cdf330f7260502c8 /src/simulation/elements/CRAY.cpp | |
| parent | 486d26e40b1a11fbad2e203ec9bed88098504b77 (diff) | |
| download | powder-8e02443f0a294fcec9bcc8678dcf8b61f0d56f99.zip powder-8e02443f0a294fcec9bcc8678dcf8b61f0d56f99.tar.gz | |
prevent CRAY from destroying DMND
Diffstat (limited to 'src/simulation/elements/CRAY.cpp')
| -rw-r--r-- | src/simulation/elements/CRAY.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simulation/elements/CRAY.cpp b/src/simulation/elements/CRAY.cpp index 93c8db9..b3f51ff 100644 --- a/src/simulation/elements/CRAY.cpp +++ b/src/simulation/elements/CRAY.cpp @@ -96,7 +96,7 @@ int Element_CRAY::update(UPDATE_FUNC_ARGS) colored = wavelengthToDecoColour(parts[r>>8].ctype); } else if ((r&0xFF)==PT_CRAY || nostop) { docontinue = 1; - } else if(destroy) { + } else if(destroy && (r&0xFF != PT_DMND)) { sim->kill_part(r>>8); if(!--partsRemaining) docontinue = 0; |