From ada263d9924c9014b445d0b855f52f1ef75d39dd Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 26 Apr 2009 15:52:37 +0000 Subject: added worldview icons, updated map --- src/client/playerview.cc | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'src/client/playerview.cc') diff --git a/src/client/playerview.cc b/src/client/playerview.cc index e4a889a..c7e50ff 100644 --- a/src/client/playerview.cc +++ b/src/client/playerview.cc @@ -21,11 +21,6 @@ PlayerView::PlayerView(ui::Widget *parent) : ui::Widget(parent) view_lastentity = 0; - label_zonename = new ui::Label(this); - label_zonename->set_alignment(ui::AlignCenter); - label_zonename->set_background(true); - label_zonename->set_font(ui::root()->font_large()); - label_viewname = new ui::Label(this); label_viewname->set_alignment(ui::AlignCenter); label_viewname->set_background(true); @@ -171,11 +166,11 @@ void PlayerView::resize() view_notify->set_geometry(view_map->location(), view_map->size()); // reposition labels - label_viewname->set_size(ui::UI::elementsize.width() * 1.5f, ui::UI::elementsize.height()); - label_viewname->set_location(smallmargin, smallmargin * 0.5f); + //label_viewname->set_size(ui::UI::elementsize.width() * 1.5f, ui::UI::elementsize.height()); + //label_viewname->set_location(smallmargin, smallmargin * 0.5f); - label_zonename->set_size(ui::UI::elementsize.width() * 1.5f, ui::UI::elementsize.height()); - label_zonename->set_location(width() - label_zonename->width() - smallmargin, height() - label_zonename->height() - smallmargin * 0.5f); + label_viewname->set_size(ui::UI::elementsize.width() * 1.5f, ui::UI::elementsize.height()); + label_viewname->set_location(width() - label_viewname->width() - smallmargin, height() - label_viewname->height() - smallmargin * 0.5f); } void PlayerView::draw() @@ -191,11 +186,15 @@ void PlayerView::draw() if (core::localplayer()->view()->menus().size()) { // entity with menus + + if (map()->visible()) { + label_viewname->set_text(core::localplayer()->zone()->name()); + } else { + label_viewname->set_text(core::localplayer()->view()->name()); + } + label_viewname->show(); - label_viewname->set_text(core::localplayer()->view()->name()); - label_zonename->show(); - if (view_lastentity != core::localplayer()->view()) { // initially show the menu show_menu("main"); @@ -233,16 +232,17 @@ void PlayerView::draw() view_buymenu->hide(); } - label_viewname->hide(); - label_zonename->set_visible(view_map->visible()); + if (map()->visible()) { + label_viewname->set_text(core::localplayer()->zone()->name()); + label_viewname->show(); + } else { + label_viewname->hide(); + } + view_hud->show(); view_lastentity = 0; } - if (label_zonename->visible()) { - label_zonename->set_text(core::localplayer()->zone()->name()); - } - // reposition chat widget if (view_chat->small_view()) { view_chat->set_size(width() - smallmargin * 2, font()->height() * 2); -- cgit v1.2.3