summaryrefslogtreecommitdiff
path: root/src/gui/game/GameModel.cpp
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-05-15 17:51:45 (GMT)
committer jacob1 <jfu614@gmail.com>2013-05-15 17:51:45 (GMT)
commitdfc33aaeeaa066ff0107b4ed68ec7756fbc5acb3 (patch)
tree51d5c2e1fd34f26d862b6eee80e3960c3243d7c1 /src/gui/game/GameModel.cpp
parent94d21a1679749df49342903545192254a27f8ffc (diff)
downloadpowder-dfc33aaeeaa066ff0107b4ed68ec7756fbc5acb3.zip
powder-dfc33aaeeaa066ff0107b4ed68ec7756fbc5acb3.tar.gz
finish return values for the legacy api, add sim.saveStamp and sim.loadStamp
Diffstat (limited to 'src/gui/game/GameModel.cpp')
-rw-r--r--src/gui/game/GameModel.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/gui/game/GameModel.cpp b/src/gui/game/GameModel.cpp
index 960f45a..aecd0eb 100644
--- a/src/gui/game/GameModel.cpp
+++ b/src/gui/game/GameModel.cpp
@@ -348,10 +348,8 @@ void GameModel::BuildMenus()
//Set default menu
activeMenu = SC_POWDERS;
- if(lastMenu != -1) //What is this? ...
- {
+ if(lastMenu != -1)
activeMenu = lastMenu;
- }
if(activeMenu != -1)
toolList = menuList[activeMenu]->GetToolList();
@@ -882,12 +880,12 @@ void GameModel::SetPlaceSave(GameSave * save)
notifyPlaceSaveChanged();
}
-void GameModel::AddStamp(GameSave * save)
+std::string GameModel::AddStamp(GameSave * save)
{
if(stamp)
delete stamp;
stamp = save;
- Client::Ref().AddStamp(save);
+ return Client::Ref().AddStamp(save);
}
void GameModel::SetClipboard(GameSave * save)