diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2013-02-17 11:31:03 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2013-02-17 11:31:03 (GMT) |
| commit | 81f92ed0ecaef62367d249e43e464d98983cb958 (patch) | |
| tree | f8bedea04aa70d2ba910e9f5c363edc2759c1b9d /src | |
| parent | 5beb4255c8972cf997c72e011db6afbd77d5be48 (diff) | |
| parent | a3454c49be3ea720e081b508a502b6fae98d7ee1 (diff) | |
| download | powder-81f92ed0ecaef62367d249e43e464d98983cb958.zip powder-81f92ed0ecaef62367d249e43e464d98983cb958.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src')
| -rw-r--r-- | src/Config.h | 2 | ||||
| -rw-r--r-- | src/simulation/elements/CRAY.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Config.h b/src/Config.h index f11d1d6..50444cd 100644 --- a/src/Config.h +++ b/src/Config.h @@ -27,7 +27,7 @@ #endif #ifndef BUILD_NUM -#define BUILD_NUM 255 +#define BUILD_NUM 261 #endif #ifndef SNAPSHOT_ID diff --git a/src/simulation/elements/CRAY.cpp b/src/simulation/elements/CRAY.cpp index b3f51ff..0638f73 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 && (r&0xFF != PT_DMND)) { + } else if(destroy && ((r&0xFF) != PT_DMND)) { sim->kill_part(r>>8); if(!--partsRemaining) docontinue = 0; |