diff --git a/Source/items.cpp b/Source/items.cpp index 77f9da0ff..163a1aa62 100644 --- a/Source/items.cpp +++ b/Source/items.cpp @@ -649,7 +649,7 @@ void GetBookSpell(Item &item, int lvl) if (s == maxSpells) s = 1; } - const string_view spellName = pgettext("spell", GetSpellData(bs).sNameText); + const string_view spellName = GetSpellData(bs).sNameText; const size_t iNameLen = string_view(item._iName).size(); const size_t iINameLen = string_view(item._iIName).size(); CopyUtf8(item._iName + iNameLen, spellName, sizeof(item._iName) - iNameLen); @@ -1142,11 +1142,11 @@ void GetStaffPower(const Player &player, Item &item, int lvl, SpellID bs, bool o } const ItemData &baseItemData = AllItemsList[item.IDidx]; - std::string staffName = GenerateStaffName(baseItemData, item._iSpell, true); + std::string staffName = GenerateStaffName(baseItemData, item._iSpell, false); CopyUtf8(item._iName, staffName, sizeof(item._iName)); if (preidx != -1) { - std::string staffNameMagical = GenerateStaffNameMagical(baseItemData, item._iSpell, preidx, true); + std::string staffNameMagical = GenerateStaffNameMagical(baseItemData, item._iSpell, preidx, false); CopyUtf8(item._iIName, staffNameMagical, sizeof(item._iIName)); } else { CopyUtf8(item._iIName, item._iName, sizeof(item._iIName)); @@ -1252,9 +1252,9 @@ void GetItemPower(const Player &player, Item &item, int minlvl, int maxlvl, Affi pSufix = &suffix; }); - CopyUtf8(item._iIName, GenerateMagicItemName(item._iName, pPrefix, pSufix, true), sizeof(item._iIName)); + CopyUtf8(item._iIName, GenerateMagicItemName(item._iName, pPrefix, pSufix, false), sizeof(item._iIName)); if (!StringInPanel(item._iIName)) { - CopyUtf8(item._iIName, GenerateMagicItemName(_(AllItemsList[item.IDidx].iSName), pPrefix, pSufix, true), sizeof(item._iIName)); + CopyUtf8(item._iIName, GenerateMagicItemName(AllItemsList[item.IDidx].iSName, pPrefix, pSufix, false), sizeof(item._iIName)); } if (pPrefix != nullptr || pSufix != nullptr) CalcItemValue(item); @@ -1326,8 +1326,8 @@ void GetOilType(Item &item, int maxLvl) int8_t t = rnd[GenerateRnd(cnt)]; - CopyUtf8(item._iName, _(OilNames[t]), sizeof(item._iName)); - CopyUtf8(item._iIName, _(OilNames[t]), sizeof(item._iIName)); + CopyUtf8(item._iName, OilNames[t], sizeof(item._iName)); + CopyUtf8(item._iIName, OilNames[t], sizeof(item._iIName)); item._iMiscId = OilMagic[t]; item._ivalue = OilValues[t]; item._iIvalue = OilValues[t]; @@ -1486,7 +1486,7 @@ void GetUniqueItem(const Player &player, Item &item, _unique_items uid) SaveItemPower(player, item, power); } - CopyUtf8(item._iIName, _(UniqueItems[uid].UIName), sizeof(item._iIName)); + CopyUtf8(item._iIName, UniqueItems[uid].UIName, sizeof(item._iIName)); item._iIvalue = UniqueItems[uid].UIValue; if (item._iMiscId == IMISC_UNIQUE) @@ -2904,8 +2904,8 @@ void InitializeItem(Item &item, _item_indexes itemData) item._itype = pAllItem.itype; item._iCurs = pAllItem.iCurs; - CopyUtf8(item._iName, _(pAllItem.iName), sizeof(item._iName)); - CopyUtf8(item._iIName, _(pAllItem.iName), sizeof(item._iIName)); + CopyUtf8(item._iName, pAllItem.iName, sizeof(item._iName)); + CopyUtf8(item._iIName, pAllItem.iName, sizeof(item._iIName)); item._iLoc = pAllItem.iLoc; item._iClass = pAllItem.iClass; item._iMinDam = pAllItem.iMinDam; @@ -3116,8 +3116,8 @@ void GetItemAttrs(Item &item, _item_indexes itemData, int lvl) auto &baseItemData = AllItemsList[static_cast(itemData)]; item._itype = baseItemData.itype; item._iCurs = baseItemData.iCurs; - CopyUtf8(item._iName, _(baseItemData.iName), sizeof(item._iName)); - CopyUtf8(item._iIName, _(baseItemData.iName), sizeof(item._iIName)); + CopyUtf8(item._iName, baseItemData.iName, sizeof(item._iName)); + CopyUtf8(item._iIName, baseItemData.iName, sizeof(item._iIName)); item._iLoc = baseItemData.iLoc; item._iClass = baseItemData.iClass; item._iMinDam = baseItemData.iMinDam; @@ -3349,7 +3349,7 @@ void RecreateEar(Item &item, uint16_t ic, int iseed, uint8_t bCursval, string_vi { InitializeItem(item, IDI_EAR); - std::string itemName = fmt::format(fmt::runtime(_(/* TRANSLATORS: {:s} will be a Character Name */ "Ear of {:s}")), heroName); + std::string itemName = fmt::format(fmt::runtime("Ear of {:s}"), heroName); CopyUtf8(item._iName, itemName, sizeof(item._iName)); CopyUtf8(item._iIName, heroName, sizeof(item._iIName));