From 451a94a6ac81e31a5092fef3eed8f5e92cf485f2 Mon Sep 17 00:00:00 2001 From: Simon Robertshaw Date: Mon, 20 Aug 2012 20:49:00 +0100 Subject: [PATCH] Clear fire/persistent effects when clearing the simulation, fixes #136 --- src/game/GameModel.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp index d7264ff38..d9cbdd7fe 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)