diff options
Diffstat (limited to 'src/simulation')
| -rw-r--r-- | src/simulation/Simulation.cpp | 2 | ||||
| -rw-r--r-- | src/simulation/elements/PSTN.cpp | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index 76c0830..60ca1f7 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -2216,7 +2216,7 @@ int Simulation::try_move(int i, int x, int y, int nx, int ny) part_change_type(i, x, y, PT_ELEC); parts[i].ctype = 0; } - else if ((r&0xFF) == PT_H2 && pv[y/CELL][x/CELL] < 45.0f) + else if ((r&0xFF) == PT_H2 && pv[y/CELL][x/CELL] < 45.0f && parts[i].temp < 3000) { part_change_type(i, x, y, PT_PROT); parts[i].ctype = 0; diff --git a/src/simulation/elements/PSTN.cpp b/src/simulation/elements/PSTN.cpp index 998f7a2..6dda77f 100644 --- a/src/simulation/elements/PSTN.cpp +++ b/src/simulation/elements/PSTN.cpp @@ -167,7 +167,7 @@ int Element_PSTN::update(UPDATE_FUNC_ARGS) //#TPT-Directive ElementHeader Element_PSTN static int CanMoveStack(Simulation * sim, int stackX, int stackY, int directionX, int directionY, int maxSize, int amount, bool retract, int block) int Element_PSTN::CanMoveStack(Simulation * sim, int stackX, int stackY, int directionX, int directionY, int maxSize, int amount, bool retract, int block) { - int posX, posY, r, spaces = 0, currentPos = 0, num = 0; + int posX, posY, r, spaces = 0, currentPos = 0; if (amount <= 0) return 0; for(posX = stackX, posY = stackY; currentPos < maxSize + amount && currentPos < XRES-1; posX += directionX, posY += directionY) { @@ -176,7 +176,7 @@ int Element_PSTN::CanMoveStack(Simulation * sim, int stackX, int stackY, int dir } r = sim->pmap[posY][posX]; if (sim->IsWallBlocking(posX, posY, 0) || (block && (r&0xFF) == block)) - return num; + return spaces; if(!r) { spaces++; tempParts[currentPos++] = -1; @@ -186,9 +186,8 @@ int Element_PSTN::CanMoveStack(Simulation * sim, int stackX, int stackY, int dir if(spaces < maxSize && currentPos < maxSize && (!retract || ((r&0xFF) == PT_FRME) && posX == stackX && posY == stackY)) tempParts[currentPos++] = r>>8; else - return num; + return spaces; } - num++; } if (spaces) return currentPos; |