Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2008-08-04 23:36:27 +0000
committerStijn Buys <ingar@osirion.org>2008-08-04 23:36:27 +0000
commita3f1320ee150ff0176f836b0b47762b31b0cd4e4 (patch)
tree402dedb6c594fc71918df08dccfe1ef5b15ca854
parent5680cffdd4afdb99d39c644a6c397e670e958848 (diff)
use small gui font everywhere
-rw-r--r--src/client/chat.cc3
-rw-r--r--src/client/console.cc3
-rw-r--r--src/client/view.cc16
3 files changed, 12 insertions, 10 deletions
diff --git a/src/client/chat.cc b/src/client/chat.cc
index 522a675..6f63a6d 100644
--- a/src/client/chat.cc
+++ b/src/client/chat.cc
@@ -96,7 +96,8 @@ void draw()
// draw cursor
if ((core::application()->time() - ::floorf(core::application()->time())) < 0.5f) {
- std::string cursor("^B_");
+ std::string cursor("^B");
+ cursor += (char) 11;
Text::draw(4+Text::fontwidth()*(draw_width+5), y , cursor);
}
}
diff --git a/src/client/console.cc b/src/client/console.cc
index 60e2a7f..9678fa7 100644
--- a/src/client/console.cc
+++ b/src/client/console.cc
@@ -507,7 +507,8 @@ void Console::draw_console()
// draw cursor
if ((core::application()->time() - ::floorf(core::application()->time())) < 0.5f) {
- std::string cursor("^B_");
+ std::string cursor("^B");
+ cursor += (char) 11;
Text::draw(4+Text::fontwidth()*(draw_width+1), y , cursor);
}
diff --git a/src/client/view.cc b/src/client/view.cc
index 862e394..6c792d6 100644
--- a/src/client/view.cc
+++ b/src/client/view.cc
@@ -397,7 +397,7 @@ void frame(float seconds)
}
}
- // switch to ortographic projection to draw the GUI
+ // switch to orthographic projection to draw the GUI
gl::matrixmode(GL_PROJECTION);
gl::loadidentity();
glOrtho(0, video::width, video::height, 0, -1024.0f, 1024.0f);
@@ -419,26 +419,26 @@ void frame(float seconds)
}
gl::enable(GL_BLEND);
-
+
// draw text elements
if (draw_ui->value()) {
-
- //Text::setfont("bitmaps/fonts/gui", 16, 24);
Text::setfont("bitmaps/fonts/gui", 12, 18);
-
+
// draw the player status
draw_status();
+ // draw the chat box
+ chat::draw();
+
// draw the mouse cursor
draw_cursor();
}
- Text::setfont("bitmaps/fonts/console", 12, 18);
- chat::draw();
+ // draw console or notifications
+ Text::setfont("bitmaps/fonts/gui", 12, 18);
console()->draw();
gl::disable(GL_TEXTURE_2D);
-
gl::disable(GL_BLEND);
}