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-10-05 21:14:09 +0000
committerStijn Buys <ingar@osirion.org>2008-10-05 21:14:09 +0000
commite8b466caefa3b0b3b70458035d1c52e9fd9c0662 (patch)
tree8a7f019040f446237ce9cc72ee4181888eab2339 /src/client/view.cc
parentaaf2809dbb28fdd6dd7c09adf5c79c12f6f4926a (diff)
internally removes bitmaps/fonts prefix from render::Text
Diffstat (limited to 'src/client/view.cc')
-rw-r--r--src/client/view.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/client/view.cc b/src/client/view.cc
index 2667938..7f9efa1 100644
--- a/src/client/view.cc
+++ b/src/client/view.cc
@@ -565,14 +565,14 @@ void draw_status()
gl::end();
}
- Text::setfont("bitmaps/fonts/gui", 14, 24);
+ Text::setfont("gui", 14, 24);
Text::setcolor('B'); //set normal color
std::stringstream speedstr;
speedstr << "^B" << roundf(core::localcontrol()->speed() * 100.0f);
Text::draw( 316+4+10, video::height - 6 -16 - render::Text::fontwidth() /2, speedstr);
- Text::setfont("bitmaps/fonts/gui", 12, 18);
+ Text::setfont("gui", 12, 18);
Text::setcolor('N'); //set normal color
}
}
@@ -836,14 +836,14 @@ void frame(float seconds)
if (!console()->visible())
console()->toggle();
- } else if (!core::game()->interactive()) {
+ } /*else if (!core::game()->interactive()) {
// draw the banner bitmap
draw_banner();
- }
+ }*/
// draw text elements
if (draw_ui->value()) {
- Text::setfont("bitmaps/fonts/gui", 12, 18);
+ Text::setfont("gui", 12, 18);
// draw the player status
draw_status();
@@ -856,7 +856,7 @@ void frame(float seconds)
}
// draw console or notifications
- Text::setfont("bitmaps/fonts/gui", 12, 18);
+ Text::setfont("gui", 12, 18);
console()->draw((bool) draw_ui->value());