From 5f331d4fcefe13f8185939bfb4158bfa96deb735 Mon Sep 17 00:00:00 2001 From: jacob1 Date: Sat, 16 Feb 2013 13:47:12 -0500 Subject: [PATCH 1/2] Update build number too --- src/Config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Config.h b/src/Config.h index f11d1d6ea..50444cd50 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 From a3454c49be3ea720e081b508a502b6fae98d7ee1 Mon Sep 17 00:00:00 2001 From: jacob1 Date: Sat, 16 Feb 2013 15:11:59 -0500 Subject: [PATCH 2/2] fix CRAY only deleting odd numbered elements --- src/simulation/elements/CRAY.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/simulation/elements/CRAY.cpp b/src/simulation/elements/CRAY.cpp index b3f51ff98..0638f736a 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;