diff options
| author | jacob1 <jfu614@gmail.com> | 2012-11-16 01:41:38 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2012-11-16 01:41:38 (GMT) |
| commit | 16e4c5f7179db5beabe3065781adec7d27000cd9 (patch) | |
| tree | b4544943d893a28a9c7c2b62fbbdc36ee2c1f514 /src/game/GameModel.cpp | |
| parent | 1e32c545d9ca7f960cdd6f77714c7b2761880478 (diff) | |
| download | powder-16e4c5f7179db5beabe3065781adec7d27000cd9.zip powder-16e4c5f7179db5beabe3065781adec7d27000cd9.tar.gz | |
save pause state in stamps, load pause state from local saves and stamps correctly, remove accidental inclusion
Diffstat (limited to 'src/game/GameModel.cpp')
| -rw-r--r-- | src/game/GameModel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp index 4a11d55..774d636 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; |