Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/view.cc')
-rw-r--r--src/client/view.cc17
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);
}