diff options
author | Stijn Buys <ingar@osirion.org> | 2008-10-15 20:33:15 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2008-10-15 20:33:15 +0000 |
commit | 1e0df536c2fae85c317ce9c3cc17603d5f98c911 (patch) | |
tree | 3ab262d51451cda3e926e9581b294f08d39031d9 /src/client/view.cc | |
parent | 97fca172fd51270cebd5b722f861a6c753bd4d2a (diff) |
moved client console into a Widget
Diffstat (limited to 'src/client/view.cc')
-rw-r--r-- | src/client/view.cc | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/client/view.cc b/src/client/view.cc index 463d254..a8d9c4f 100644 --- a/src/client/view.cc +++ b/src/client/view.cc @@ -243,12 +243,6 @@ void View::draw() } else { view_center->set_visible(false); } - - if (!ui::root()->active() && !has_input_focus()) { - set_focus(); - } - - } /* -- namespace view ----------------------------------------------- */ @@ -628,7 +622,7 @@ void draw_hud() void draw_cursor() { - if (console()->visible()) + if (client()->console()->visible()) return; float angle = 0; @@ -731,9 +725,6 @@ void frame(float elapsed) { using namespace render; - // flush console messages - console()->flush(); - // Clear the color and depth buffers. gl::clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); @@ -778,11 +769,7 @@ void frame(float elapsed) draw_cursor(); } - // draw console or notifications - Text::setfont("gui", 12, 18); - - console()->draw((bool) draw_ui->value()); - + gl::disable(GL_TEXTURE_2D); gl::disable(GL_BLEND); } |