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

fix bug where PSTN would write past tempParts and into other things, like corrupting TRON colors and making it all blue

Browse Source
This commit is contained in:
jacob1 2013-07-10 21:01:34 -04:00
parent 081c58990e
commit c29bfd285d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/simulation/elements/PSTN.cpp
View File

@ -46,8 +46,8 @@ Element_PSTN::Element_PSTN()
Graphics = &Element_PSTN::graphics; Graphics = &Element_PSTN::graphics;
} }
//#TPT-Directive ElementHeader Element_PSTN static int tempParts[128]; //#TPT-Directive ElementHeader Element_PSTN static int tempParts[XRES]
int Element_PSTN::tempParts[128]; int Element_PSTN::tempParts[XRES];
#define PISTON_INACTIVE 0x00 #define PISTON_INACTIVE 0x00
#define PISTON_RETRACT 0x01 #define PISTON_RETRACT 0x01
@ -170,7 +170,7 @@ int Element_PSTN::CanMoveStack(Simulation * sim, int stackX, int stackY, int dir
int posX, posY, r, spaces = 0, currentPos = 0; int posX, posY, r, spaces = 0, currentPos = 0;
if (amount <= 0) if (amount <= 0)
return 0; return 0;
for(posX = stackX, posY = stackY; currentPos < maxSize + amount; posX += directionX, posY += directionY) { for(posX = stackX, posY = stackY; currentPos < maxSize + amount && currentPos < XRES-1; posX += directionX, posY += directionY) {
if (!(posX < XRES && posY < YRES && posX >= 0 && posY >= 0)) { if (!(posX < XRES && posY < YRES && posX >= 0 && posY >= 0)) {
break; break;
} }
@ -257,7 +257,7 @@ int Element_PSTN::MoveStack(Simulation * sim, int stackX, int stackY, int direct
for(int j = 1; j <= amount; j++) for(int j = 1; j <= amount; j++)
sim->kill_part(sim->pmap[stackY+(directionY*-j)][stackX+(directionX*-j)]>>8); sim->kill_part(sim->pmap[stackY+(directionY*-j)][stackX+(directionX*-j)]>>8);
bool foundEnd = false; bool foundEnd = false;
for(posX = stackX, posY = stackY; currentPos < maxSize; posX += directionX, posY += directionY) { for(posX = stackX, posY = stackY; currentPos < maxSize && currentPos < XRES-1; posX += directionX, posY += directionY) {
if (!(posX < XRES && posY < YRES && posX >= 0 && posY >= 0)) { if (!(posX < XRES && posY < YRES && posX >= 0 && posY >= 0)) {
break; break;
} }