From 151a2ac2434f4b4c23c107d9c21e4a18dd1a3c68 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Mon, 4 Feb 2008 18:42:05 +0000 Subject: converted client:: singleton classes to namespaces --- src/client/console.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/client/console.cc') diff --git a/src/client/console.cc b/src/client/console.cc index dfc1d08..f435e9a 100644 --- a/src/client/console.cc +++ b/src/client/console.cc @@ -54,7 +54,7 @@ void Console::draw() gl::color(0.0f, 1.0f, 0.0f, 0.5f); std:: string version = std::string("The Osirion Project "); version.append(VERSION); - draw_text(video.width-CHARWIDTH*(version.size()+1), video.height*con_height-CHARHEIGHT-4, version); + draw_text(video::width-CHARWIDTH*(version.size()+1), video::height*con_height-CHARHEIGHT-4, version); gl::disable(GL_TEXTURE_2D); // draw the transparent console background @@ -62,15 +62,15 @@ void Console::draw() gl::begin(gl::Quads); gl::vertex(0.0f, 0.0f, 0.0f); - gl::vertex(video.width, 0.0f,0.0f); - gl::vertex(video.width,video.height*con_height,0.0f); - gl::vertex(0,video.height*con_height,0.0f); + gl::vertex(video::width, 0.0f,0.0f); + gl::vertex(video::width,video::height*con_height,0.0f); + gl::vertex(0,video::height*con_height,0.0f); gl::end(); // draw the console text gl::enable(GL_TEXTURE_2D); std::deque::reverse_iterator rit = console.text.rbegin(); - float y = video.height*con_height-2*CHARHEIGHT-8; + float y = video::height*con_height-2*CHARHEIGHT-8; while (y > 0 && rit < console.text.rend()) { std::string line(*rit); @@ -91,12 +91,12 @@ void Console::draw() // draw the console input gl::color(0.0f, 1.0f, 0.0f, 1.0f); - draw_text(CHARWIDTH, video.height*con_height - CHARHEIGHT - 4, input); + draw_text(CHARWIDTH, video::height*con_height - CHARHEIGHT - 4, input); // draw cursor if ((core::time() - floorf(core::time())) < 0.5f) { std::string cursor("_"); - draw_text(CHARWIDTH*(input.size()+1), video.height*con_height - CHARHEIGHT - 4 , cursor); + draw_text(CHARWIDTH*(input.size()+1), video::height*con_height - CHARHEIGHT - 4 , cursor); } gl::disable(GL_TEXTURE_2D); } -- cgit v1.2.3