summaryrefslogtreecommitdiff
path: root/src/game/GameModel.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-01-31 18:49:14 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-01-31 18:49:14 (GMT)
commit857b0cc1fc58f066acd59404d16ee5e566e20f00 (patch)
tree7607fc43f3bdd63687dff39209f44defa48e6a35 /src/game/GameModel.cpp
parent1d297cb57a338f2a9e34d0f16642afc6a83c1041 (diff)
downloadpowder-857b0cc1fc58f066acd59404d16ee5e566e20f00.zip
powder-857b0cc1fc58f066acd59404d16ee5e566e20f00.tar.gz
Load user information from preferences, fps display for testing
Diffstat (limited to 'src/game/GameModel.cpp')
-rw-r--r--src/game/GameModel.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp
index 92224de..2ff9e0b 100644
--- a/src/game/GameModel.cpp
+++ b/src/game/GameModel.cpp
@@ -47,6 +47,11 @@ GameModel::GameModel():
activeTools[0] = new ElementTool(1, "TURD", 0, 0, 0);
activeTools[1] = new ElementTool(0, "TURD", 0, 0, 0);
//activeTool[1] = new ElementTool(0, "TURD", 0, 0, 0);
+ std::cout << Client::Ref().GetAuthUser().Username << std::endl;
+ if(Client::Ref().GetAuthUser().ID)
+ {
+ currentUser = Client::Ref().GetAuthUser();
+ }
}
GameModel::~GameModel()
@@ -108,6 +113,8 @@ void GameModel::AddObserver(GameView * observer){
observer->NotifyBrushChanged(this);
observer->NotifyMenuListChanged(this);
observer->NotifyToolListChanged(this);
+ observer->NotifyUserChanged(this);
+ observer->NotifyZoomChanged(this);
}
void GameModel::SetActiveMenu(Menu * menu)