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

Don't reset decorations when sparking with INWR+CRAY(most things)

Browse Source 
INWR+CRAY(SOAP) will reset decorations
This commit is contained in:
jacksonmj 2013-09-08 11:30:21 +01:00
parent 79edfe9589
commit 5ad67f7778
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,7 +80,7 @@ int Element_CRAY::update(UPDATE_FUNC_ARGS)
unsigned int colored = 0;
bool destroy = parts[r>>8].ctype==PT_PSCN;
bool nostop = parts[r>>8].ctype==PT_INST;
bool createSpark = (parts[r>>8].ctype==PT_INWR);
bool createOnExisting = (parts[r>>8].ctype==PT_INWR);
int partsRemaining = 255;
if (parts[i].tmp) //how far it shoots
partsRemaining = parts[i].tmp;
@ -89,8 +89,26 @@ int Element_CRAY::update(UPDATE_FUNC_ARGS)
break;
}
r = pmap[y+nyi+nyy][x+nxi+nxx];
if (!sim->IsWallBlocking(x+nxi+nxx, y+nyi+nyy, parts[i].ctype) && (!sim->pmap[y+nyi+nyy][x+nxi+nxx] || createSpark)) { // create, also set color if it has passed through FILT
if (!sim->IsWallBlocking(x+nxi+nxx, y+nyi+nyy, parts[i].ctype) && (!r || createOnExisting)) { // create, also set color if it has passed through FILT
int nr;
if (createOnExisting)
{
if (r&0xFF)
{
if (parts[i].ctype == PT_SOAP)
parts[r>>8].dcolour = 0;
else if (parts[i].ctype == PT_FILT)
parts[r>>8].dcolour = colored;
else
nr = sim->create_part(-1, x+nxi+nxx, y+nyi+nyy, PT_SPRK);
if ((r&0xFF)==PT_FILT)
colored = wavelengthToDecoColour(Element_FILT::getWavelengths(&parts[r>>8]));
if (!--partsRemaining)
docontinue = 0;
}
}
else
{
if (parts[i].ctype == PT_LIFE)
nr = sim->create_part(-1, x+nxi+nxx, y+nyi+nyy, parts[i].ctype|(parts[i].tmp2<<8));
else
@ -101,6 +119,7 @@ int Element_CRAY::update(UPDATE_FUNC_ARGS)
if(!--partsRemaining)
docontinue = 0;
}
}
} else if ((r&0xFF)==PT_FILT) { // get color if passed through FILT
colored = wavelengthToDecoColour(Element_FILT::getWavelengths(&parts[r>>8]));
} else if ((r&0xFF) == PT_CRAY || nostop) {