From f030154fe727e25a2afe1f78b3998c2d2dba95e4 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Tue, 18 Aug 2009 09:24:15 +0000
Subject: astyle cleanup, corrects not loading of material textures

---
 src/client/buymenu.cc | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'src/client/buymenu.cc')

diff --git a/src/client/buymenu.cc b/src/client/buymenu.cc
index 8c69a7a..d12f23e 100644
--- a/src/client/buymenu.cc
+++ b/src/client/buymenu.cc
@@ -16,9 +16,9 @@ namespace client
 BuyMenu::BuyMenu(ui::Widget *parent, const char * label) : ui::Window(parent)
 {
 	set_border(false);
-	set_background(true);	
+	set_background(true);
 
-	if (label)	
+	if (label)
 		set_label(label);
 	else
 		set_label("buymenu");
@@ -34,7 +34,7 @@ BuyMenu::BuyMenu(ui::Widget *parent, const char * label) : ui::Window(parent)
 	menu_modelview->set_background(false);
 	menu_modelview->set_border(false);
 
-	menu_closebutton = new ui::Button(menu_modelpane, "Close","view hide");
+	menu_closebutton = new ui::Button(menu_modelpane, "Close", "view hide");
 
 	// text pane (right)
 	menu_textpane = new ui::Window(this);
@@ -48,7 +48,7 @@ BuyMenu::BuyMenu(ui::Widget *parent, const char * label) : ui::Window(parent)
 	menu_namelabel->set_border(false);
 	menu_namelabel->set_font(ui::root()->font_large());
 	menu_namelabel->set_alignment(ui::AlignCenter);
-	
+
 	menu_scrollpane = new ui::ScrollPane(menu_textpane, menu_infotext);
 	menu_scrollpane->set_background(false);
 	menu_scrollpane->set_border(false);
@@ -83,7 +83,7 @@ void BuyMenu::set_item(std::string const & itemtype, std::string const & itemnam
 	menu_namelabel->set_text(0);
 	menu_modelview->set_modelname(0);
 
-	core::Info *info = core::game()->info(itemtype+'/'+itemname);
+	core::Info *info = core::game()->info(itemtype + '/' + itemname);
 	if (info) {
 		menu_namelabel->set_text(info->name());
 		menu_modelview->set_modelname(info->modelname());
@@ -111,10 +111,10 @@ void BuyMenu::resize()
 	menu_modelpane->set_location(smallmargin, smallmargin * 2.0f);
 
 	menu_closebutton->set_size(ui::UI::elementsize);
-	menu_closebutton->set_location((menu_modelpane->width() - menu_closebutton->width()) * 0.5f, 
-			menu_modelpane->height() - menu_closebutton->height() -  ui::UI::elementsize.height() * 0.5f);
+	menu_closebutton->set_location((menu_modelpane->width() - menu_closebutton->width()) * 0.5f,
+				       menu_modelpane->height() - menu_closebutton->height() -  ui::UI::elementsize.height() * 0.5f);
 
-	menu_modelview->set_size(menu_modelpane->width()-8, menu_modelpane->width()-8);
+	menu_modelview->set_size(menu_modelpane->width() - 8, menu_modelpane->width() - 8);
 	menu_modelview->set_location(4, 4);
 
 	// reposition text pane (right)
@@ -122,13 +122,13 @@ void BuyMenu::resize()
 	menu_textpane->set_location(smallmargin * 2.0f + menu_modelpane->width(), smallmargin * 2.0f);
 
 	menu_buybutton->set_size(ui::UI::elementsize);
-	menu_buybutton->set_location((menu_textpane->width() - menu_buybutton->width()) * 0.5f, 
-			menu_textpane->height() - menu_buybutton->height() -  ui::UI::elementsize.height() * 0.5f);
+	menu_buybutton->set_location((menu_textpane->width() - menu_buybutton->width()) * 0.5f,
+				     menu_textpane->height() - menu_buybutton->height() -  ui::UI::elementsize.height() * 0.5f);
 
 	menu_namelabel->set_size(menu_textpane->width(), menu_namelabel->font()->height() * 2.0f);
 	menu_namelabel->set_location(0, 4);
 
-	menu_scrollpane->set_size(menu_textpane->width() - 8, menu_buybutton->top() - menu_namelabel->bottom() - 8 );
+	menu_scrollpane->set_size(menu_textpane->width() - 8, menu_buybutton->top() - menu_namelabel->bottom() - 8);
 	menu_scrollpane->set_location(4,  menu_namelabel->bottom() + 4);
 
 }
@@ -142,14 +142,14 @@ void BuyMenu::draw()
 
 bool BuyMenu::on_keypress(const int key, const unsigned int modifier)
 {
-	switch( key ) {
-	
-	case SDLK_ESCAPE:
-		this->hide();
-		return true;
-		break;
-	default:
-		break;
+	switch (key) {
+
+		case SDLK_ESCAPE:
+			this->hide();
+			return true;
+			break;
+		default:
+			break;
 	}
 
 	return Window::on_keypress(key, modifier);
-- 
cgit v1.2.3