diff options
| author | jacob1 <jfu614@gmail.com> | 2012-10-19 19:06:07 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-10-26 14:15:24 (GMT) |
| commit | e2622657f076ef943d051593d0969306daf15f32 (patch) | |
| tree | 1e5b811c3d50552b591c54e9918b22ef661bfdfa /src/game/GameModel.cpp | |
| parent | 63daf67d44c284068a6104221121f466d9790ad9 (diff) | |
| download | powder-e2622657f076ef943d051593d0969306daf15f32.zip powder-e2622657f076ef943d051593d0969306daf15f32.tar.gz | |
ability to reload and resave local saves without retyping name
Diffstat (limited to 'src/game/GameModel.cpp')
| -rw-r--r-- | src/game/GameModel.cpp | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp index 49e031f..f905a1c 100644 --- a/src/game/GameModel.cpp +++ b/src/game/GameModel.cpp @@ -22,6 +22,7 @@ GameModel::GameModel(): currentBrush(0), currentUser(0, ""), currentSave(NULL), + currentFile(NULL), colourSelector(false), clipboard(NULL), stamp(NULL), @@ -159,6 +160,8 @@ GameModel::~GameModel() delete stamp; if(currentSave) delete currentSave; + if(currentFile) + delete currentFile; //if(activeTools) // delete[] activeTools; } @@ -536,6 +539,9 @@ void GameModel::SetSave(SaveInfo * newSave) else currentSave = new SaveInfo(*newSave); } + if(currentFile) + delete currentFile; + currentFile = NULL; if(currentSave && currentSave->GetGameSave()) { @@ -558,9 +564,25 @@ void GameModel::SetSave(SaveInfo * newSave) UpdateQuickOptions(); } +SaveFile * GameModel::GetFile() +{ + return currentFile; +} + void GameModel::SetSaveFile(SaveFile * newSave) { - SetSave(NULL); + if(currentFile != newSave) + { + if(currentFile) + delete currentFile; + if(newSave == NULL) + currentFile = NULL; + else + currentFile = new SaveFile(*newSave); + } + if (currentSave) + delete currentSave; + currentSave = NULL; if(newSave && newSave->GetGameSave()) { |