Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2011-09-04 17:54:51 +0000
committerStijn Buys <ingar@osirion.org>2011-09-04 17:54:51 +0000
commit69eed715f80c24c2435c82bb9fa1954697bf3af0 (patch)
treea21aa14d2ecfa86b94d3b122c2c972d758425782 /src/client/entitymenu.cc
parentedd5dfcd15198f5d5d277835fdf75108eb67472d (diff)
Moved main menu infrastructure into client namespace,
removed ui::Container and ui::Menu classes.
Diffstat (limited to 'src/client/entitymenu.cc')
-rw-r--r--src/client/entitymenu.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/client/entitymenu.cc b/src/client/entitymenu.cc
index ee1d373..f9a5edc 100644
--- a/src/client/entitymenu.cc
+++ b/src/client/entitymenu.cc
@@ -6,6 +6,7 @@
#include "client/entitymenu.h"
+#include "client/client.h"
#include "ui/ui.h"
#include "ui/paint.h"
@@ -171,7 +172,7 @@ bool EntityMenu::on_keypress(const int key, const unsigned int modifier)
generate(menu_generated_entity, "main");
} else {
this->hide();
- ui::root()->show_menu("game");
+ Client::show_menu("game");
}
return true;
}