diff options
| author | Bryan Hoyle <starfoxprime@gmail.com> | 2012-11-16 21:51:55 (GMT) |
|---|---|---|
| committer | Bryan Hoyle <starfoxprime@gmail.com> | 2012-11-16 21:51:55 (GMT) |
| commit | 874cd400093c38e67fde4a1861603bce83135539 (patch) | |
| tree | e9c8b31b7cc752133dd0e110c652ed9775e859d5 /src/game/GameModel.cpp | |
| parent | e0aa92b017a8d5602ce8b43f6e240ab42a25fac4 (diff) | |
| parent | d8be547c734cfaa3d121412b11381b4787380762 (diff) | |
| download | powder-874cd400093c38e67fde4a1861603bce83135539.zip powder-874cd400093c38e67fde4a1861603bce83135539.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/PowderToypp
Diffstat (limited to 'src/game/GameModel.cpp')
| -rw-r--r-- | src/game/GameModel.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp index 4a11d55..5c4ee97 100644 --- a/src/game/GameModel.cpp +++ b/src/game/GameModel.cpp @@ -587,7 +587,7 @@ void GameModel::SetSaveFile(SaveFile * newSave) if(newSave && newSave->GetGameSave()) { GameSave * saveData = newSave->GetGameSave(); - SetPaused(saveData->paused & GetPaused()); + SetPaused(saveData->paused | GetPaused()); sim->gravityMode = saveData->gravityMode; sim->air->airMode = saveData->airMode; sim->legacy_enable = saveData->legacyEnable; @@ -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(); |