summaryrefslogtreecommitdiff
path: root/src/game/GameModel.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-08-20 19:49:00 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-08-20 19:49:00 (GMT)
commit451a94a6ac81e31a5092fef3eed8f5e92cf485f2 (patch)
tree66facd69558a60824ab55cc499c7f9216b8915d9 /src/game/GameModel.cpp
parent1b75cbdcc93ebe63c4eae9e12107ce3ebf8ca7a6 (diff)
downloadpowder-451a94a6ac81e31a5092fef3eed8f5e92cf485f2.zip
powder-451a94a6ac81e31a5092fef3eed8f5e92cf485f2.tar.gz
Clear fire/persistent effects when clearing the simulation, fixes #136
Diffstat (limited to 'src/game/GameModel.cpp')
-rw-r--r--src/game/GameModel.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp
index d7264ff..d9cbdd7 100644
--- a/src/game/GameModel.cpp
+++ b/src/game/GameModel.cpp
@@ -433,6 +433,7 @@ void GameModel::SetSave(SaveInfo * newSave)
sim->grav->stop_grav_async();
sim->clear_sim();
sim->SetEdgeMode(0);
+ ren->ClearAccumulation();
sim->Load(saveData);
}
notifySaveChanged();
@@ -460,6 +461,8 @@ void GameModel::SetSaveFile(SaveFile * newSave)
sim->grav->stop_grav_async();
}
sim->clear_sim();
+ sim->SetEdgeMode(0);
+ ren->ClearAccumulation();
sim->Load(saveData);
}
@@ -623,6 +626,7 @@ void GameModel::FrameStep(int frames)
void GameModel::ClearSimulation()
{
sim->clear_sim();
+ ren->ClearAccumulation();
}
void GameModel::SetStamp(GameSave * save)