diff options
author | Stijn Buys <ingar@osirion.org> | 2008-07-15 00:16:45 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2008-07-15 00:16:45 +0000 |
commit | 84d6f8c6a58c2b0e94a6137b4a055a4e32d29457 (patch) | |
tree | aa39a09291cf7bbcc21287c44cc895192233da4d /src/client/view.cc | |
parent | bb73e3aaa036fb4450e98c715e80a6e8d9f2714d (diff) |
various small fixes
Diffstat (limited to 'src/client/view.cc')
-rw-r--r-- | src/client/view.cc | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/client/view.cc b/src/client/view.cc index fa96096..2bbae15 100644 --- a/src/client/view.cc +++ b/src/client/view.cc @@ -146,9 +146,6 @@ void draw_status() { using namespace render; - if (console()->visible()) - return; - // print the status in the upper left corner std::stringstream status; @@ -267,8 +264,6 @@ void draw_cursor() } - - gl::color(color); gl::begin(gl::Quads); @@ -305,6 +300,9 @@ void frame(float seconds) if (core::application()->connected() && core::game()->serverframetime()) { render::draw(seconds); // draw the world + if (draw_radar->value()) { + Radar::draw(); + } } // switch to ortographic projection to draw the GUI @@ -323,14 +321,6 @@ void frame(float seconds) } // draw text elements - Text::setfont("bitmaps/fonts/console", 12, 18); - console()->draw(); - chat::draw(); - - if (draw_radar->value()) { - Radar::draw(); - } - if (draw_ui->value()) { Text::setfont("bitmaps/fonts/gui", 16, 24); draw_status(); @@ -338,6 +328,10 @@ void frame(float seconds) // draw the mouse cursor draw_cursor(); } + + Text::setfont("bitmaps/fonts/console", 12, 18); + chat::draw(); + console()->draw(); gl::disable(GL_TEXTURE_2D); } |