matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GameModel manages currentSave instance

Browse Source
This commit is contained in:
Simon Robertshaw 2012-06-18 16:43:40 +01:00
parent 5e301ba17c
commit 7ffaa421d1
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/GameController.cpp
View File

@ -38,7 +38,7 @@ public:
{ {
try try
{ {
cc->gameModel->SetSave(new SaveInfo(*(cc->search->GetLoadedSave()))); cc->gameModel->SetSave(cc->search->GetLoadedSave());
} }
catch(GameModelException & ex) catch(GameModelException & ex)
{ {

8
src/game/GameModel.cpp
View File

@ -182,6 +182,8 @@ GameModel::~GameModel()
delete clipboard; delete clipboard;
if(stamp) if(stamp)
delete stamp; delete stamp;
if(currentSave)
delete currentSave;
//if(activeTools) //if(activeTools)
// delete[] activeTools; // delete[] activeTools;
} }
@ -279,7 +281,11 @@ void GameModel::SetSave(SaveInfo * newSave)
{ {
if(currentSave != newSave) if(currentSave != newSave)
delete currentSave; delete currentSave;
currentSave = newSave; if(newSave == NULL)
currentSave = NULL;
else if(currentSave != newSave)
currentSave = new SaveInfo(*newSave);
if(currentSave && currentSave->GetGameSave()) if(currentSave && currentSave->GetGameSave())
{ {
GameSave * saveData = currentSave->GetGameSave(); GameSave * saveData = currentSave->GetGameSave();