From cc18095cded14f5e7e3f049e47fca2224134b647 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 19 Sep 2010 19:44:13 +0000 Subject: text rendering cleanups, inventory capacity & cargo volume --- src/ui/ui.cc | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'src/ui/ui.cc') diff --git a/src/ui/ui.cc b/src/ui/ui.cc index a6d54ab..5faf9fd 100644 --- a/src/ui/ui.cc +++ b/src/ui/ui.cc @@ -360,12 +360,12 @@ void UI::apply_render_options() { //con_debug << " initializing text colors" << std::endl; // apply palette colors - paint::assign_color('N', palette()->text()); - paint::assign_color('D', palette()->debug()); - paint::assign_color('B', palette()->bold()); - paint::assign_color('F', palette()->fancy()); - paint::assign_color('W', palette()->warning()); - paint::assign_color('E', palette()->error()); + Paint::assign_system_color('N', palette()->text()); + Paint::assign_system_color('D', palette()->debug()); + Paint::assign_system_color('B', palette()->bold()); + Paint::assign_system_color('F', palette()->fancy()); + Paint::assign_system_color('W', palette()->warning()); + Paint::assign_system_color('E', palette()->error()); } @@ -567,11 +567,12 @@ void UI::draw_pointer() } else { c.a = 0.5f; } - paint::color(c); + Paint::set_color(c); + math::Vector2f pos(mouse_cursor.x() - pointer_size * 0.5f, mouse_cursor.y() - pointer_size * 0.5f); math::Vector2f s(pointer_size, pointer_size); - std::string texture("pointers/"); + std::string texture("bitmaps/pointers/"); texture.append(mouse_pointer_bitmap); if (mouse_pointer_animated) { @@ -584,7 +585,7 @@ void UI::draw_pointer() gl::translate(-mouse_cursor.x(), -mouse_cursor.y(), 0); } - paint::bitmap(pos, s, texture); + Paint::draw_bitmap(pos, s, texture); if (mouse_pointer_animated) { gl::pop(); -- cgit v1.2.3