diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-06-12 14:37:46 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-06-12 14:37:46 (GMT) |
| commit | 6f814528fcf09a5c2bda26a9054972ca13e4d874 (patch) | |
| tree | c4c7d22f073b1b6049e8c8379c09b67153479ac7 /src/game/GameModel.cpp | |
| parent | f6f83cc276a7a1b5d8d295440fd0adff7bacf59a (diff) | |
| download | powder-6f814528fcf09a5c2bda26a9054972ca13e4d874.zip powder-6f814528fcf09a5c2bda26a9054972ca13e4d874.tar.gz | |
Correct save reloading, add Vac and NGrav tools
Diffstat (limited to 'src/game/GameModel.cpp')
| -rw-r--r-- | src/game/GameModel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp index 2ae0713..5c9344d 100644 --- a/src/game/GameModel.cpp +++ b/src/game/GameModel.cpp @@ -281,13 +281,13 @@ SaveInfo * GameModel::GetSave() void GameModel::SetSave(SaveInfo * newSave) { - if(currentSave) + if(currentSave != newSave) delete currentSave; currentSave = newSave; if(currentSave && currentSave->GetGameSave()) { GameSave * saveData = currentSave->GetGameSave(); - SetPaused(saveData->paused); + SetPaused(saveData->paused & GetPaused()); sim->gravityMode = saveData->gravityMode; sim->air->airMode = saveData->airMode; sim->legacy_enable = saveData->legacyEnable; |