summaryrefslogtreecommitdiff
path: root/src/game/GameController.cpp
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-01-14 18:11:01 (GMT)
committer jacob1 <jfu614@gmail.com>2013-01-14 18:11:01 (GMT)
commite515512d88eab18794cf490ad55d4050a8d9f403 (patch)
treef501b97270b037260a6b6670deb88df4e39c10dd /src/game/GameController.cpp
parent73fdfd411ce2a8470cf854e48237d609d0ad3bb6 (diff)
downloadpowder-e515512d88eab18794cf490ad55d4050a8d9f403.zip
powder-e515512d88eab18794cf490ad55d4050a8d9f403.tar.gz
deco menu needs to be clicked to enter, press 'b' to get out of deco editor too
Diffstat (limited to 'src/game/GameController.cpp')
-rw-r--r--src/game/GameController.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp
index 01b4b13..0b35681 100644
--- a/src/game/GameController.cpp
+++ b/src/game/GameController.cpp
@@ -925,6 +925,11 @@ void GameController::SetActiveMenu(Menu * menu)
gameModel->SetColourSelectorVisibility(false);
}
+std::vector<Menu*> GameController::GetMenuList()
+{
+ return gameModel->GetMenuList();
+}
+
void GameController::SetActiveTool(int toolSelection, Tool * tool)
{
commandInterface->OnActiveToolChanged(toolSelection, tool);
@@ -1387,9 +1392,3 @@ void GameController::RunUpdater()
Exit();
new UpdateActivity();
}
-
-std::vector<Menu*> GameController::GetMenuList()
-{
- return gameModel->GetMenuList();
-}
-