diff options
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/GameModel.cpp | 7 | ||||
| -rw-r--r-- | src/game/GameView.cpp | 2 |
2 files changed, 8 insertions, 1 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) diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp index e46ae21..a443025 100644 --- a/src/game/GameView.cpp +++ b/src/game/GameView.cpp @@ -516,7 +516,7 @@ void GameView::OnKeyRelease(int key, Uint16 character, bool shift, bool ctrl, bo drawMode = DrawPoints; else drawModeReset = true; - switch(character) + switch(key) { case 'z': if(!zoomCursorFixed) |