summaryrefslogtreecommitdiff
path: root/src/game/GameController.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-02-01 18:45:59 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-02-01 18:45:59 (GMT)
commit038da72c61ea6a251d805e2de3662f240da52b02 (patch)
tree05170050b16f9d663ec44ae451211e686ba196ac /src/game/GameController.cpp
parent857b0cc1fc58f066acd59404d16ee5e566e20f00 (diff)
downloadpowder-038da72c61ea6a251d805e2de3662f240da52b02.zip
powder-038da72c61ea6a251d805e2de3662f240da52b02.tar.gz
Console UI, open in browser button, tab and enter shortcut for Login UI, various
Diffstat (limited to 'src/game/GameController.cpp')
-rw-r--r--src/game/GameController.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp
index 9e5f53b..a4e0ccc 100644
--- a/src/game/GameController.cpp
+++ b/src/game/GameController.cpp
@@ -95,6 +95,10 @@ GameController::~GameController()
{
delete loginWindow;
}
+ if(console)
+ {
+ delete console;
+ }
if(ui::Engine::Ref().GetWindow() == gameView)
{
ui::Engine::Ref().CloseWindow();
@@ -301,6 +305,12 @@ void GameController::OpenDisplayOptions()
//TODO: Implement
}
+void GameController::ShowConsole()
+{
+ console = new ConsoleController(NULL);
+ ui::Engine::Ref().ShowWindow(console->GetView());
+}
+
void GameController::OpenRenderOptions()
{
renderOptions = new RenderController(gameModel->GetRenderer(), new RenderCallback(this));