diff options
author | Stijn Buys <ingar@osirion.org> | 2009-11-13 22:25:09 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2009-11-13 22:25:09 +0000 |
commit | a993d31910b63a1f897e470842934e6ffefad32c (patch) | |
tree | fef52482d762acbbd35e97f382b60ff24ce5071f /src/client | |
parent | 5ddb64795cc959916eeedbec8dc3f65c06f49698 (diff) |
added core::InfoType, refactored game::ShipModel as core::Info subclass, introduced core::Label
Diffstat (limited to 'src/client')
-rw-r--r-- | src/client/buymenu.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/client/buymenu.cc b/src/client/buymenu.cc index d12f23e..7fad916 100644 --- a/src/client/buymenu.cc +++ b/src/client/buymenu.cc @@ -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, "Return", "view hide"); // text pane (right) menu_textpane = new ui::Window(this); @@ -76,14 +76,14 @@ void BuyMenu::set_item(std::string const & itemtype, std::string const & itemnam menu_itemname.assign(itemname); aux::to_label(menu_itemname); - menu_buybutton->set_command("remote buy " + itemtype + ' ' + itemname + "; view hide"); - menu_buybutton->set_label("buy " + itemname); + menu_buybutton->set_command("remote buy " + menu_itemtype + ' ' + menu_itemname + "; view hide"); + menu_buybutton->set_label("buy " + menu_itemname); menu_infotext.clear(); menu_namelabel->set_text(0); menu_modelview->set_modelname(0); - core::Info *info = core::game()->info(itemtype + '/' + itemname); + core::Info *info = core::game()->info(menu_itemtype, menu_itemname); if (info) { menu_namelabel->set_text(info->name()); menu_modelview->set_modelname(info->modelname()); |