diff --git a/src/game/blueprint/item.cpp b/src/game/blueprint/item.cpp index 34d54d1f..fc2736b9 100644 --- a/src/game/blueprint/item.cpp +++ b/src/game/blueprint/item.cpp @@ -39,7 +39,7 @@ void ItemBlueprint::load(const GffStruct &uti) { _tag = uti.getString("Tag"); boost::to_lower(_tag); - _localizedName = Resources::instance().getString(uti.getInt("LocalizedName")).text; + _localizedName = Resources::instance().getString(uti.getInt("LocalizedName")); shared_ptr baseItems(Resources::instance().get2DA("baseitems")); int baseItem = uti.getInt("BaseItem"); diff --git a/src/game/gui/chargen/classselect.cpp b/src/game/gui/chargen/classselect.cpp index 9f99ac86..c161d20f 100644 --- a/src/game/gui/chargen/classselect.cpp +++ b/src/game/gui/chargen/classselect.cpp @@ -227,10 +227,10 @@ void ClassSelection::onFocusChanged(const string &control, bool focus) { ClassButton &button = _classButtons[idx]; - string classText(Resources::instance().getString(g_genderStrRefs[button.config.gender]).text); - classText += " " + Resources::instance().getString(g_classStrRefs[button.config.clazz]).text; + string classText(Resources::instance().getString(g_genderStrRefs[button.config.gender])); + classText += " " + Resources::instance().getString(g_classStrRefs[button.config.clazz]); - string descText(Resources::instance().getString(g_classDescStrRefs[button.config.clazz]).text); + string descText(Resources::instance().getString(g_classDescStrRefs[button.config.clazz])); getControl("LBL_CLASS").setTextMessage(classText); getControl("LBL_DESC").setTextMessage(descText); diff --git a/src/game/gui/container.cpp b/src/game/gui/container.cpp index 34d99300..e188060a 100644 --- a/src/game/gui/container.cpp +++ b/src/game/gui/container.cpp @@ -58,10 +58,10 @@ Container::Container(Game *game) : void Container::load() { GUI::load(); - string btnMessage(Resources::instance().getString(kSwitchToResRef).text + " " + Resources::instance().getString(kGiveItemResRef).text); + string btnMessage(Resources::instance().getString(kSwitchToResRef) + " " + Resources::instance().getString(kGiveItemResRef)); getControl("BTN_GIVEITEMS").setTextMessage(btnMessage); - string lblMessage(Resources::instance().getString(kInventoryResRef).text); + string lblMessage(Resources::instance().getString(kInventoryResRef)); getControl("LBL_MESSAGE").setTextMessage(lblMessage); configureItemsListBox(); diff --git a/src/game/gui/equip.cpp b/src/game/gui/equip.cpp index b2bc0ac9..0efe9a62 100644 --- a/src/game/gui/equip.cpp +++ b/src/game/gui/equip.cpp @@ -304,7 +304,7 @@ void Equipment::updateItems() { if (_selectedSlot != Slot::None) { ListBox::Item lbItem; lbItem.tag = "[none]"; - lbItem.text = Resources::instance().getString(kStrRefNone).text; + lbItem.text = Resources::instance().getString(kStrRefNone); lbItem.icon = Textures::instance().get("inone", TextureType::GUI); lbItems.add(move(lbItem)); diff --git a/src/game/gui/partyselect.cpp b/src/game/gui/partyselect.cpp index e084954a..d4f411c3 100644 --- a/src/game/gui/partyselect.cpp +++ b/src/game/gui/partyselect.cpp @@ -174,7 +174,7 @@ void PartySelection::refreshAvailableCount() { } void PartySelection::refreshAcceptButton() { - string text(Resources::instance().getString(_added[_selectedNpc] ? g_strRefRemove : g_strRefAdd).text); + string text(Resources::instance().getString(_added[_selectedNpc] ? g_strRefRemove : g_strRefAdd)); Button &btnAccept = getControl