diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-06-09 13:54:58 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-06-09 13:54:58 (GMT) |
| commit | c408e035faf88f968ea208d48ced4b7c3c9dc32d (patch) | |
| tree | d98f393173b2aead0fd164cd467ee4c2dcbd7e2b /src/game/GameModel.cpp | |
| parent | 46614017c8f9e1a293109fb9d202ed3b634427f5 (diff) | |
| download | powder-c408e035faf88f968ea208d48ced4b7c3c9dc32d.zip powder-c408e035faf88f968ea208d48ced4b7c3c9dc32d.tar.gz | |
Preview: Wait for save to load before opening, Simulation: Correct block coords when reading wall data, replace existing particles when placing stamps on top, Game: Clear the simulation when loading a save
Diffstat (limited to 'src/game/GameModel.cpp')
| -rw-r--r-- | src/game/GameModel.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp index 9e655f9..362eddd 100644 --- a/src/game/GameModel.cpp +++ b/src/game/GameModel.cpp @@ -275,12 +275,8 @@ void GameModel::SetSave(SaveInfo * newSave) currentSave = newSave; if(currentSave) { - int returnVal = sim->Load(currentSave->GetGameSave()); - if(returnVal){ - delete currentSave; - currentSave = NULL; - throw GameModelException(returnVal==2?"Save from newer version":"Save data corrupt"); - } + sim->clear_sim(); + sim->Load(currentSave->GetGameSave()); } notifySaveChanged(); notifyPausedChanged(); |