summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-03-05 19:55:39 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-03-05 19:55:39 (GMT)
commit7e3d45bbfb701a5eca3e93b589680d8651ada016 (patch)
treebfdd7260e46979922e1343bb579d2768fa53feed /src/game
parent81f3114cb22592a8c09fa564db49fbea079f1328 (diff)
downloadpowder-7e3d45bbfb701a5eca3e93b589680d8651ada016.zip
powder-7e3d45bbfb701a5eca3e93b589680d8651ada016.tar.gz
Tag UI - actually more of a box at the moment
Diffstat (limited to 'src/game')
-rw-r--r--src/game/GameController.cpp10
-rw-r--r--src/game/GameController.h2
2 files changed, 10 insertions, 2 deletions
diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp
index 1164de5..25f02e9 100644
--- a/src/game/GameController.cpp
+++ b/src/game/GameController.cpp
@@ -71,7 +71,8 @@ GameController::GameController():
renderOptions(NULL),
loginWindow(NULL),
ssave(NULL),
- console(NULL)
+ console(NULL),
+ tagsWindow(NULL)
{
gameView = new GameView();
gameModel = new GameModel();
@@ -99,6 +100,10 @@ GameController::~GameController()
{
delete loginWindow;
}
+ if(tagsWindow)
+ {
+ delete tagsWindow;
+ }
if(console)
{
delete console;
@@ -333,7 +338,8 @@ void GameController::OpenLogin()
void GameController::OpenTags()
{
- //TODO: Implement
+ tagsWindow = new TagsController(NULL);
+ ui::Engine::Ref().ShowWindow(tagsWindow->GetView());
}
void GameController::OpenDisplayOptions()
diff --git a/src/game/GameController.h b/src/game/GameController.h
index 8480aeb..7944dc7 100644
--- a/src/game/GameController.h
+++ b/src/game/GameController.h
@@ -10,6 +10,7 @@
#include "render/RenderController.h"
#include "login/LoginController.h"
#include "ssave/SSaveController.h"
+#include "tags/TagsController.h"
#include "console/ConsoleController.h"
//#include "cat/TPTScriptInterface.h"
#include "cat/LuaScriptInterface.h"
@@ -32,6 +33,7 @@ private:
LoginController * loginWindow;
SSaveController * ssave;
ConsoleController * console;
+ TagsController * tagsWindow;
CommandInterface * commandInterface;
public:
class LoginCallback;