diff options
| author | jacob1 <jfu614@gmail.com> | 2013-07-10 20:59:10 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-07-10 20:59:10 (GMT) |
| commit | 3203e597b9546d85c3eff887ea4f01e051ebbba0 (patch) | |
| tree | 9170e9f21628af7aed013daf96b365afc58c9fde | |
| parent | e7a3fd1c29bdc3f16fc6c04ce36f7268adb55092 (diff) | |
| download | powder-3203e597b9546d85c3eff887ea4f01e051ebbba0.zip powder-3203e597b9546d85c3eff887ea4f01e051ebbba0.tar.gz | |
fix piston bugs, fix crashes, don't use bluescreens when compiled with debug mode in visual studio
| -rw-r--r-- | src/PowderToySDL.cpp | 2 | ||||
| -rw-r--r-- | src/gui/preview/PreviewModel.cpp | 4 | ||||
| -rw-r--r-- | src/simulation/Simulation.cpp | 2 | ||||
| -rw-r--r-- | src/simulation/elements/PSTN.cpp | 10 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/PowderToySDL.cpp b/src/PowderToySDL.cpp index f49ed55..0f79d9e 100644 --- a/src/PowderToySDL.cpp +++ b/src/PowderToySDL.cpp @@ -779,7 +779,7 @@ int main(int argc, char * argv[]) engine->Begin(XRES+BARSIZE, YRES+MENUSIZE); engine->SetFastQuit(Client::Ref().GetPrefBool("FastQuit", true)); -#ifndef DEBUG +#if !defined(DEBUG) && !defined(_DEBUG) //Get ready to catch any dodgy errors signal(SIGSEGV, SigHandler); signal(SIGFPE, SigHandler); diff --git a/src/gui/preview/PreviewModel.cpp b/src/gui/preview/PreviewModel.cpp index 5903f77..8d5d574 100644 --- a/src/gui/preview/PreviewModel.cpp +++ b/src/gui/preview/PreviewModel.cpp @@ -252,7 +252,7 @@ void PreviewModel::Update() delete updateSaveDataInfo; updateSaveDataInfo = NULL; - if (save) + if (save && saveData) { commentsTotal = save->Comments; try @@ -279,7 +279,7 @@ void PreviewModel::Update() delete updateSaveInfoInfo; updateSaveInfoInfo = NULL; - if (save) + if (save && saveData) { commentsTotal = save->Comments; try diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp index 5d40529..747a019 100644 --- a/src/simulation/Simulation.cpp +++ b/src/simulation/Simulation.cpp @@ -308,7 +308,7 @@ void Simulation::Restore(const Snapshot & snap) { parts_lastActiveIndex = NPART-1; - for(int i; i<NPART; i++) + for(int i = 0; i<NPART; i++) elementCount[i] = 0; std::copy(snap.AirPressure.begin(), snap.AirPressure.end(), &pv[0][0]); diff --git a/src/simulation/elements/PSTN.cpp b/src/simulation/elements/PSTN.cpp index ba2ba85..d880ee8 100644 --- a/src/simulation/elements/PSTN.cpp +++ b/src/simulation/elements/PSTN.cpp @@ -168,7 +168,7 @@ int Element_PSTN::update(UPDATE_FUNC_ARGS) 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; - if (amount == 0) + if (amount <= 0) return 0; for(posX = stackX, posY = stackY; currentPos < maxSize + amount; posX += directionX, posY += directionY) { if (!(posX < XRES && posY < YRES && posX >= 0 && posY >= 0)) { @@ -176,14 +176,14 @@ 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)) - break; + return spaces; if(!r) { spaces++; tempParts[currentPos++] = -1; if(spaces >= amount) break; } else { - if(spaces < maxSize && !retract) + if(spaces < maxSize && currentPos < maxSize && (!retract || ((r&0xFF) == PT_FRME) && posX == stackX && posY == stackY)) tempParts[currentPos++] = r>>8; else return spaces; @@ -212,7 +212,7 @@ int Element_PSTN::MoveStack(Simulation * sim, int stackX, int stackY, int direct posY = stackY + (c*newY); posX = stackX + (c*newX); if (posX < XRES && posY < YRES && posX >= 0 && posY >= 0 && (sim->pmap[posY][posX]&0xFF) == PT_FRME) { - int val = CanMoveStack(sim, posX+realDirectionX, posY+realDirectionY, realDirectionX, realDirectionY, maxSize, amount, retract, block); + int val = CanMoveStack(sim, posX, posY, realDirectionX, realDirectionY, maxSize, amount, retract, block); if(val < amount) amount = val; } else { @@ -224,7 +224,7 @@ int Element_PSTN::MoveStack(Simulation * sim, int stackX, int stackY, int direct posY = stackY - (c*newY); posX = stackX - (c*newX); if (posX < XRES && posY < YRES && posX >= 0 && posY >= 0 && (sim->pmap[posY][posX]&0xFF) == PT_FRME) { - int val = CanMoveStack(sim, posX+realDirectionX, posY+realDirectionY, realDirectionX, realDirectionY, maxSize, amount, retract, block); + int val = CanMoveStack(sim, posX, posY, realDirectionX, realDirectionY, maxSize, amount, retract, block); if(val < amount) amount = val; } else { |