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

prevent CRAY from destroying DMND

Browse Source
This commit is contained in:
jacob1 2013-02-01 14:29:18 -05:00
parent 486d26e40b
commit 8e02443f0a
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/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) { } 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;

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

@ -72,7 +72,7 @@ int Element_STOR::update(UPDATE_FUNC_ARGS)
if(parts[i].tmp && (r&0xFF)==PT_SPRK && parts[r>>8].ctype==PT_PSCN && parts[r>>8].life>0 && parts[r>>8].life<4) if(parts[i].tmp && (r&0xFF)==PT_SPRK && parts[r>>8].ctype==PT_PSCN && parts[r>>8].life>0 && parts[r>>8].life<4)
{ {
for(ry1 = 1; ry1 >= -1; ry1--){ for(ry1 = 1; ry1 >= -1; ry1--){
for(rx1 = 0; rx1 >= -1 && rx1 <= 1; rx1 = -rx1-rx1+1){ // Oscilate the X starting at 0, 1, -1, 3, -5, etc (Though stop at -1) for(rx1 = 0; rx1 >= -1 && rx1 <= 1; rx1 = -rx1-rx1+1){ // Oscillate the X starting at 0, 1, -1, 3, -5, etc (Though stop at -1)
np = sim->create_part(-1,x+rx1,y+ry1,parts[i].tmp); np = sim->create_part(-1,x+rx1,y+ry1,parts[i].tmp);
if (np!=-1) if (np!=-1)
{ {