summaryrefslogtreecommitdiff
path: root/src/game/GameModel.cpp
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2012-11-16 01:50:19 (GMT)
committer jacob1 <jfu614@gmail.com>2012-11-16 01:50:19 (GMT)
commitd8be547c734cfaa3d121412b11381b4787380762 (patch)
tree160f1de2e286acbbc5273dae329a5211f757888f /src/game/GameModel.cpp
parent16e4c5f7179db5beabe3065781adec7d27000cd9 (diff)
downloadpowder-d8be547c734cfaa3d121412b11381b4787380762.zip
powder-d8be547c734cfaa3d121412b11381b4787380762.tar.gz
fix pause state being reset every time you clear the sim
Diffstat (limited to 'src/game/GameModel.cpp')
-rw-r--r--src/game/GameModel.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp
index 774d636..5c4ee97 100644
--- a/src/game/GameModel.cpp
+++ b/src/game/GameModel.cpp
@@ -823,17 +823,15 @@ void GameModel::FrameStep(int frames)
void GameModel::ClearSimulation()
{
- sim->clear_sim();
- ren->ClearAccumulation();
//Load defaults
- SetPaused(false);
sim->gravityMode = 0;
sim->air->airMode = 0;
sim->legacy_enable = false;
sim->water_equal_test = false;
sim->grav->stop_grav_async();
sim->SetEdgeMode(edgeMode);
+
sim->clear_sim();
ren->ClearAccumulation();