diff options
| author | Stijn Buys <ingar@osirion.org> | 2008-10-21 19:00:39 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2008-10-21 19:00:39 +0000 |
| commit | d79c0223315beaf55fcd10d6891675c4d57b5e2b (patch) | |
| tree | 3ea902634192dfcffa21a4e7a8cd28da714f0daa /src/client/view.cc | |
| parent | 9f2e49593639a9f1f3e5f4f7b690ff364afefd56 (diff) | |
moved client console into libui
Diffstat (limited to 'src/client/view.cc')
| -rw-r--r-- | src/client/view.cc | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/client/view.cc b/src/client/view.cc index 8eaf63f..77e0906 100644 --- a/src/client/view.cc +++ b/src/client/view.cc @@ -14,7 +14,6 @@ #include "auxiliary/functions.h" #include "client/client.h" #include "client/chat.h" -#include "client/console.h" #include "client/input.h" #include "client/targets.h" #include "client/video.h" @@ -35,9 +34,6 @@ core::Cvar *draw_stats = 0; core::Cvar *draw_devinfo = 0; core::Cvar *draw_keypress = 0; -core::Cvar *ui_pointercolor = 0; -core::Cvar *ui_pointerhovercolor = 0; - unsigned long previousframe = 0; void time_to_stream(std::stringstream &str, float time) @@ -248,7 +244,7 @@ void View::draw() view_keypress->set_visible(draw_keypress->value() ? true : false); if (core::application()->connected() && core::game()->interactive()) { - if (client()->console()->visible()) { + if (ui::console()->visible()) { view_notify->set_visible(false); } else if (view_chat->visible() && !view_chat->small()) { view_notify->set_visible(false); @@ -278,12 +274,6 @@ void init() draw_ui = core::Cvar::get("draw_ui", "1", core::Cvar::Archive); draw_ui->set_info("[bool] draw the user interface"); - ui_pointercolor = core::Cvar::get("ui_pointercolor", "0 .5 0", core::Cvar::Archive); - ui_pointercolor->set_info("[r g b] mouse pointer color"); - - ui_pointerhovercolor = core::Cvar::get("ui_pointerhovercolor", "0 1 0", core::Cvar::Archive); - ui_pointerhovercolor->set_info("[r g b] mouse pointer hover color"); - targets::init(); previousframe = 0; @@ -645,7 +635,7 @@ void draw_hud() void draw_cursor() { - if (client()->console()->visible()) { + if (ui::console()->visible()) { ui::root()->set_pointer(); } else if(ui::root()->active()) { |