mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-30 11:19:51 +02:00
Code Issues Projects Releases Wiki Activity

Fix FRME limits

Browse Source
This commit is contained in:
Simon Robertshaw
2013-01-23 19:17:11 +00:00
parent 412e13a03e
commit 0034dd654e
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,7 +53,7 @@ int Element_PSTN::tempParts[128];
#define PISTON_INACTIVE 0x00 #define PISTON_INACTIVE 0x00
#define PISTON_RETRACT 0x01 #define PISTON_RETRACT 0x01
#define PISTON_EXTEND 0x02 #define PISTON_EXTEND 0x02
#define MAX_FRAME 0xFF #define MAX_FRAME 0x0F
//#TPT-Directive ElementHeader Element_PSTN static int update(UPDATE_FUNC_ARGS) //#TPT-Directive ElementHeader Element_PSTN static int update(UPDATE_FUNC_ARGS)
int Element_PSTN::update(UPDATE_FUNC_ARGS) int Element_PSTN::update(UPDATE_FUNC_ARGS)
@@ -170,10 +170,11 @@ int Element_PSTN::MoveStack(Simulation * sim, int stackX, int stackY, int direct
int val = MoveStack(sim, posX, posY, directionX, directionY, size, amount, retract, 1); int val = MoveStack(sim, posX, posY, directionX, directionY, size, amount, retract, 1);
if(val < biggestMove) if(val < biggestMove)
biggestMove = val; biggestMove = val;
} } else
break;
} }
if(!c) }
continue; //If in the centre, don't do extend twice for(int c = 1; c < MAX_FRAME; c++) {
posY = stackY - (c*newY); posY = stackY - (c*newY);
posX = stackX - (c*newX); posX = stackX - (c*newX);
if (posX < XRES && posY < YRES && posX >= 0 && posY >= 0) { if (posX < XRES && posY < YRES && posX >= 0 && posY >= 0) {
@@ -182,7 +183,8 @@ int Element_PSTN::MoveStack(Simulation * sim, int stackX, int stackY, int direct
int val = MoveStack(sim, posX, posY, directionX, directionY, size, amount, retract, 1); int val = MoveStack(sim, posX, posY, directionX, directionY, size, amount, retract, 1);
if(val < biggestMove) if(val < biggestMove)
biggestMove = val; biggestMove = val;
} } else
break;
} }
} }
return biggestMove; return biggestMove;