matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy

Browse Source
This commit is contained in:
Simon Robertshaw 2013-02-17 11:31:03 +00:00
commit 81f92ed0ec
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Config.h
View File

@ -27,7 +27,7 @@
#endif #endif
#ifndef BUILD_NUM #ifndef BUILD_NUM
#define BUILD_NUM 255 #define BUILD_NUM 261
#endif #endif
#ifndef SNAPSHOT_ID #ifndef SNAPSHOT_ID

2
src/simulation/elements/CRAY.cpp
View File

@ -96,7 +96,7 @@ int Element_CRAY::update(UPDATE_FUNC_ARGS)
colored = wavelengthToDecoColour(parts[r>>8].ctype); colored = wavelengthToDecoColour(parts[r>>8].ctype);
} else if ((r&0xFF)==PT_CRAY || nostop) { } else if ((r&0xFF)==PT_CRAY || nostop) {
docontinue = 1; docontinue = 1;
} else if(destroy && (r&0xFF != PT_DMND)) { } else if(destroy && ((r&0xFF) != PT_DMND)) {
sim->kill_part(r>>8); sim->kill_part(r>>8);
if(!--partsRemaining) if(!--partsRemaining)
docontinue = 0; docontinue = 0;