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-07-29 21:10:05 +0000
committerStijn Buys <ingar@osirion.org>2011-07-29 21:10:05 +0000
commit336766125f25b94dd9fc19aeea35c8b43acbeea0 (patch)
tree29074c9e4bac688d03ceed2bd97a7ffdea8cff8e /src/client/client.h
parente2b15c76e438e8325feafef23435d473f9c2e776 (diff)
Renamed various user interface classes, somewhat improved inventory window.
Diffstat (limited to 'src/client/client.h')
-rw-r--r--src/client/client.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/client/client.h b/src/client/client.h
index 5b869ad..ff7ac98 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -12,7 +12,7 @@
#include "core/entity.h"
#include "client/clientext.h"
#include "client/soundext.h"
-#include "client/testmodelview.h"
+#include "client/testmodelwindow.h"
#include "client/mainwindow.h"
#include "render/renderext.h"
@@ -66,8 +66,8 @@ public:
}
/// model test widget
- inline TestModelView *testmodelview() {
- return client_testmodelview;
+ inline TestModelWindow *testmodelwindow() {
+ return client_testmodelwindow;
}
/// local client sends a chat message
@@ -89,6 +89,7 @@ private:
static void func_list_menu(std::string const &args);
static void func_ui_help();
+ static void func_menu_help();
static void func_ui(std::string const &args);
static void func_ui_chat(std::string const &args);
@@ -103,7 +104,7 @@ private:
static void func_view(std::string const &args);
MainWindow *client_mainwindow;
- TestModelView *client_testmodelview;
+ TestModelWindow *client_testmodelwindow;
unsigned long previous_timestamp;
};