added worldview icons, updated map

1 files changed, 22 insertions, 0 deletions

diff --git a/src/client/worldview.cc b/src/client/worldview.cc
index cde7c37..dc8370d 100644
--- a/src/client/worldview.cc
+++ b/src/client/worldview.cc
@@ -25,6 +25,11 @@ WorldView::WorldView(ui::Widget *parent) : ui::Widget(parent)
 	view_playerview = new PlayerView(this);
 	view_playerview->raise();
 	view_playerview->hide();
+
+	// icon buttons
+	view_menubutton = new ui::IconButton(this, "icons/button_menu", "ui_menu");
+	view_chatbutton = new ui::IconButton(this, "icons/button_chat", "ui_chat");
+	view_mapbutton  = new ui::IconButton(this, "icons/button_map", "ui_map");
 }
 
 WorldView::~WorldView()
@@ -54,6 +59,17 @@ void WorldView::resize()
 	view_keyinfo->set_size(font()->width()*12, font()->height()*1); 
 	view_keyinfo->set_location(width() - view_keyinfo->width() - smallmargin,
 				height() - view_keyinfo->height() - smallmargin);
+
+	// icons
+	const float icon_margin = 4.0f;
+	const float icon_size = 48.0f;
+	const float icon_count = 4;
+	const float l = (width() -((icon_count +1) * icon_margin) - (icon_count * icon_size)) * 0.5f;
+	
+	view_menubutton->set_geometry(l, icon_margin, icon_size, icon_size);
+	// spacer
+	view_chatbutton->set_geometry( l + 2.0f * (icon_margin + icon_size), icon_margin, icon_size, icon_size);
+	view_mapbutton->set_geometry( l + 3.0f * (icon_margin + icon_size), icon_margin, icon_size, icon_size);
 }
 
 void WorldView::clear()
@@ -77,8 +93,14 @@ void WorldView::draw()
 	
 	if (ui::root()->active() || !core::game()->interactive() || !core::localcontrol()) {
 		view_playerview->hide();
+		view_menubutton->hide();
+		view_chatbutton->hide();
+		view_mapbutton->hide();
 	} else {
 		view_playerview->show();
+		view_menubutton->show();
+		view_chatbutton->show();
+		view_mapbutton->show();
 	}
 }