mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Use std::string in PrintItemPower

pull/3753/head
Anders Jenbo 4 years ago committed by GitHub
parent
af08a99691
commit
6d346c7e18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 203 additions and 275 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      Source/DiabloUI/scrollbar.h
  2. 4
      Source/inv.cpp
  3. 411
      Source/items.cpp
  4. 6
      Source/items.h
  5. 56
      Source/stores.cpp

1
Source/DiabloUI/scrollbar.h
Unescape View File

@ -12,7 +12,6 @@ extern Art ArtScrollBarThumb;
extern Art ArtScrollBarArrow;
const Uint16 SCROLLBAR_BG_WIDTH = 25;
extern Art ArtScrollBarArrow;
enum ScrollBarArrowFrame : uint8_t {
ScrollBarArrowFrame_UP_ACTIVE,
ScrollBarArrowFrame_UP,

4
Source/inv.cpp
Unescape View File

@ -1972,10 +1972,10 @@ int8_t CheckInvHLight()
InfoColor = pi->getTextColor();
if (pi->_iIdentified) {
strcpy(infostr, pi->_iIName);
PrintItemDetails(pi);
PrintItemDetails(*pi);
} else {
strcpy(infostr, pi->_iName);
PrintItemDur(pi);
PrintItemDur(*pi);
}
}

411
Source/items.cpp
Unescape View File

@ -1991,7 +1991,7 @@ void DrawUniqueInfoWindow(const Surface &out)
DrawHalfTransparentRectTo(out, GetRightPanel().position.x - SPANEL_WIDTH + 27, GetRightPanel().position.y + 28, 265, 297);
}
void PrintItemMisc(Item &item)
void PrintItemMisc(const Item &item)
{
if (item._iMiscId == IMISC_SCROLL) {
strcpy(tempstr, _("Right-click to read"));
@ -2040,7 +2040,7 @@ void PrintItemMisc(Item &item)
}
}
void PrintItemInfo(Item &item)
void PrintItemInfo(const Item &item)
{
PrintItemMisc(item);
uint8_t str = item._iMinStr;
@ -3737,292 +3737,226 @@ void DoOil(Player &player, int cii)
NewCursor(CURSOR_HAND);
}
void PrintItemPower(char plidx, Item *x)
[[nodiscard]] std::string PrintItemPower(char plidx, const Item &item)
{
switch (plidx) {
case IPL_TOHIT:
case IPL_TOHIT_CURSE:
strcpy(tempstr, fmt::format(_("chance to hit: {:+d}%"), x->_iPLToHit).c_str());
break;
return fmt::format(_("chance to hit: {:+d}%"), item._iPLToHit);
case IPL_DAMP:
case IPL_DAMP_CURSE:
/*xgettext:no-c-format*/ strcpy(tempstr, fmt::format(_("{:+d}% damage"), x->_iPLDam).c_str());
break;
return fmt::format(_("{:+d}% damage"), item._iPLDam);
case IPL_TOHIT_DAMP:
case IPL_TOHIT_DAMP_CURSE:
strcpy(tempstr, fmt::format(_("to hit: {:+d}%, {:+d}% damage"), x->_iPLToHit, x->_iPLDam).c_str());
break;
return fmt::format(_("to hit: {:+d}%, {:+d}% damage"), item._iPLToHit, item._iPLDam);
case IPL_ACP:
case IPL_ACP_CURSE:
/*xgettext:no-c-format*/ strcpy(tempstr, fmt::format(_("{:+d}% armor"), x->_iPLAC).c_str());
break;
return fmt::format(_("{:+d}% armor"), item._iPLAC);
case IPL_SETAC:
case IPL_AC_CURSE:
strcpy(tempstr, fmt::format(_("armor class: {:d}"), x->_iAC).c_str());
break;
return fmt::format(_("armor class: {:d}"), item._iAC);
case IPL_FIRERES:
case IPL_FIRERES_CURSE:
if (x->_iPLFR < 75)
strcpy(tempstr, fmt::format(_("Resist Fire: {:+d}%"), x->_iPLFR).c_str());
if (item._iPLFR < 75)
return fmt::format(_("Resist Fire: {:+d}%"), item._iPLFR);
else
/*xgettext:no-c-format*/ strcpy(tempstr, _("Resist Fire: 75% MAX"));
break;
return _("Resist Fire: 75% MAX");
case IPL_LIGHTRES:
case IPL_LIGHTRES_CURSE:
if (x->_iPLLR < 75)
strcpy(tempstr, fmt::format(_("Resist Lightning: {:+d}%"), x->_iPLLR).c_str());
if (item._iPLLR < 75)
return fmt::format(_("Resist Lightning: {:+d}%"), item._iPLLR);
else
/*xgettext:no-c-format*/ strcpy(tempstr, _("Resist Lightning: 75% MAX"));
break;
return _("Resist Lightning: 75% MAX");
case IPL_MAGICRES:
case IPL_MAGICRES_CURSE:
if (x->_iPLMR < 75)
strcpy(tempstr, fmt::format(_("Resist Magic: {:+d}%"), x->_iPLMR).c_str());
if (item._iPLMR < 75)
return fmt::format(_("Resist Magic: {:+d}%"), item._iPLMR);
else
/*xgettext:no-c-format*/ strcpy(tempstr, _("Resist Magic: 75% MAX"));
break;
return _("Resist Magic: 75% MAX");
case IPL_ALLRES:
case IPL_ALLRES_CURSE:
if (x->_iPLFR < 75)
strcpy(tempstr, fmt::format(_("Resist All: {:+d}%"), x->_iPLFR).c_str());
if (x->_iPLFR >= 75)
/*xgettext:no-c-format*/ strcpy(tempstr, _("Resist All: 75% MAX"));
break;
if (item._iPLFR < 75)
return fmt::format(_("Resist All: {:+d}%"), item._iPLFR);
else
return _("Resist All: 75% MAX");
case IPL_SPLLVLADD:
if (x->_iSplLvlAdd > 0)
strcpy(tempstr, fmt::format(ngettext("spells are increased {:d} level", "spells are increased {:d} levels", x->_iSplLvlAdd), x->_iSplLvlAdd).c_str());
else if (x->_iSplLvlAdd < 0)
strcpy(tempstr, fmt::format(ngettext("spells are decreased {:d} level", "spells are decreased {:d} levels", -x->_iSplLvlAdd), -x->_iSplLvlAdd).c_str());
else if (x->_iSplLvlAdd == 0)
strcpy(tempstr, _("spell levels unchanged (?)"));
break;
if (item._iSplLvlAdd > 0)
return fmt::format(ngettext("spells are increased {:d} level", "spells are increased {:d} levels", item._iSplLvlAdd), item._iSplLvlAdd);
else if (item._iSplLvlAdd < 0)
return fmt::format(ngettext("spells are decreased {:d} level", "spells are decreased {:d} levels", -item._iSplLvlAdd), -item._iSplLvlAdd);
else
return _("spell levels unchanged (?)");
case IPL_CHARGES:
strcpy(tempstr, _("Extra charges"));
break;
return _("Extra charges");
case IPL_SPELL:
strcpy(tempstr, fmt::format(ngettext("{:d} {:s} charge", "{:d} {:s} charges", x->_iMaxCharges), x->_iMaxCharges, pgettext("spell", spelldata[x->_iSpell].sNameText)).c_str());
break;
return fmt::format(ngettext("{:d} {:s} charge", "{:d} {:s} charges", item._iMaxCharges), item._iMaxCharges, pgettext("spell", spelldata[item._iSpell].sNameText));
case IPL_FIREDAM:
if (x->_iFMinDam == x->_iFMaxDam)
strcpy(tempstr, fmt::format(_("Fire hit damage: {:d}"), x->_iFMinDam).c_str());
if (item._iFMinDam == item._iFMaxDam)
return fmt::format(_("Fire hit damage: {:d}"), item._iFMinDam);
else
strcpy(tempstr, fmt::format(_("Fire hit damage: {:d}-{:d}"), x->_iFMinDam, x->_iFMaxDam).c_str());
break;
return fmt::format(_("Fire hit damage: {:d}-{:d}"), item._iFMinDam, item._iFMaxDam);
case IPL_LIGHTDAM:
if (x->_iLMinDam == x->_iLMaxDam)
strcpy(tempstr, fmt::format(_("Lightning hit damage: {:d}"), x->_iLMinDam).c_str());
if (item._iLMinDam == item._iLMaxDam)
return fmt::format(_("Lightning hit damage: {:d}"), item._iLMinDam);
else
strcpy(tempstr, fmt::format(_("Lightning hit damage: {:d}-{:d}"), x->_iLMinDam, x->_iLMaxDam).c_str());
break;
return fmt::format(_("Lightning hit damage: {:d}-{:d}"), item._iLMinDam, item._iLMaxDam);
case IPL_STR:
case IPL_STR_CURSE:
strcpy(tempstr, fmt::format(_("{:+d} to strength"), x->_iPLStr).c_str());
break;
return fmt::format(_("{:+d} to strength"), item._iPLStr);
case IPL_MAG:
case IPL_MAG_CURSE:
strcpy(tempstr, fmt::format(_("{:+d} to magic"), x->_iPLMag).c_str());
break;
return fmt::format(_("{:+d} to magic"), item._iPLMag);
case IPL_DEX:
case IPL_DEX_CURSE:
strcpy(tempstr, fmt::format(_("{:+d} to dexterity"), x->_iPLDex).c_str());
break;
return fmt::format(_("{:+d} to dexterity"), item._iPLDex);
case IPL_VIT:
case IPL_VIT_CURSE:
strcpy(tempstr, fmt::format(_("{:+d} to vitality"), x->_iPLVit).c_str());
break;
return fmt::format(_("{:+d} to vitality"), item._iPLVit);
case IPL_ATTRIBS:
case IPL_ATTRIBS_CURSE:
strcpy(tempstr, fmt::format(_("{:+d} to all attributes"), x->_iPLStr).c_str());
break;
return fmt::format(_("{:+d} to all attributes"), item._iPLStr);
case IPL_GETHIT_CURSE:
case IPL_GETHIT:
strcpy(tempstr, fmt::format(_("{:+d} damage from enemies"), x->_iPLGetHit).c_str());
break;
return fmt::format(_("{:+d} damage from enemies"), item._iPLGetHit);
case IPL_LIFE:
case IPL_LIFE_CURSE:
strcpy(tempstr, fmt::format(_("Hit Points: {:+d}"), x->_iPLHP >> 6).c_str());
break;
return fmt::format(_("Hit Points: {:+d}"), item._iPLHP >> 6);
case IPL_MANA:
case IPL_MANA_CURSE:
strcpy(tempstr, fmt::format(_("Mana: {:+d}"), x->_iPLMana >> 6).c_str());
break;
return fmt::format(_("Mana: {:+d}"), item._iPLMana >> 6);
case IPL_DUR:
strcpy(tempstr, _("high durability"));
break;
return _("high durability");
case IPL_DUR_CURSE:
strcpy(tempstr, _("decreased durability"));
break;
return _("decreased durability");
case IPL_INDESTRUCTIBLE:
strcpy(tempstr, _("indestructible"));
break;
return _("indestructible");
case IPL_LIGHT:
/*xgettext:no-c-format*/ strcpy(tempstr, fmt::format(_("+{:d}% light radius"), 10 * x->_iPLLight).c_str());
break;
return fmt::format(_("+{:d}% light radius"), 10 * item._iPLLight);
case IPL_LIGHT_CURSE:
/*xgettext:no-c-format*/ strcpy(tempstr, fmt::format(_("-{:d}% light radius"), -10 * x->_iPLLight).c_str());
break;
return fmt::format(_("-{:d}% light radius"), -10 * item._iPLLight);
case IPL_MULT_ARROWS:
strcpy(tempstr, _("multiple arrows per shot"));
break;
return _("multiple arrows per shot");
case IPL_FIRE_ARROWS:
if (x->_iFMinDam == x->_iFMaxDam)
strcpy(tempstr, fmt::format(_("fire arrows damage: {:d}"), x->_iFMinDam).c_str());
if (item._iFMinDam == item._iFMaxDam)
return fmt::format(_("fire arrows damage: {:d}"), item._iFMinDam);
else
strcpy(tempstr, fmt::format(_("fire arrows damage: {:d}-{:d}"), x->_iFMinDam, x->_iFMaxDam).c_str());
break;
return fmt::format(_("fire arrows damage: {:d}-{:d}"), item._iFMinDam, item._iFMaxDam);
case IPL_LIGHT_ARROWS:
if (x->_iLMinDam == x->_iLMaxDam)
strcpy(tempstr, fmt::format(_("lightning arrows damage {:d}"), x->_iLMinDam).c_str());
if (item._iLMinDam == item._iLMaxDam)
return fmt::format(_("lightning arrows damage {:d}"), item._iLMinDam);
else
strcpy(tempstr, fmt::format(_("lightning arrows damage {:d}-{:d}"), x->_iLMinDam, x->_iLMaxDam).c_str());
break;
return fmt::format(_("lightning arrows damage {:d}-{:d}"), item._iLMinDam, item._iLMaxDam);
case IPL_FIREBALL:
if (x->_iFMinDam == x->_iFMaxDam)
strcpy(tempstr, fmt::format(_("fireball damage: {:d}"), x->_iFMinDam).c_str());
if (item._iFMinDam == item._iFMaxDam)
return fmt::format(_("fireball damage: {:d}"), item._iFMinDam);
else
strcpy(tempstr, fmt::format(_("fireball damage: {:d}-{:d}"), x->_iFMinDam, x->_iFMaxDam).c_str());
break;
return fmt::format(_("fireball damage: {:d}-{:d}"), item._iFMinDam, item._iFMaxDam);
case IPL_THORNS:
strcpy(tempstr, _("attacker takes 1-3 damage"));
break;
return _("attacker takes 1-3 damage");
case IPL_NOMANA:
strcpy(tempstr, _("user loses all mana"));
break;
return _("user loses all mana");
case IPL_NOHEALPLR:
strcpy(tempstr, _("you can't heal"));
break;
return _("you can't heal");
case IPL_ABSHALFTRAP:
strcpy(tempstr, _("absorbs half of trap damage"));
break;
return _("absorbs half of trap damage");
case IPL_KNOCKBACK:
strcpy(tempstr, _("knocks target back"));
break;
return _("knocks target back");
case IPL_3XDAMVDEM:
/*xgettext:no-c-format*/ strcpy(tempstr, _("+200% damage vs. demons"));
break;
return _("+200% damage vs. demons");
case IPL_ALLRESZERO:
strcpy(tempstr, _("All Resistance equals 0"));
break;
return _("All Resistance equals 0");
case IPL_NOHEALMON:
strcpy(tempstr, _("hit monster doesn't heal"));
break;
return _("hit monster doesn't heal");
case IPL_STEALMANA:
if ((x->_iFlags & ISPL_STEALMANA_3) != 0)
/*xgettext:no-c-format*/ strcpy(tempstr, _("hit steals 3% mana"));
if ((x->_iFlags & ISPL_STEALMANA_5) != 0)
/*xgettext:no-c-format*/ strcpy(tempstr, _("hit steals 5% mana"));
break;
if ((item._iFlags & ISPL_STEALMANA_3) != 0)
return _("hit steals 3% mana");
if ((item._iFlags & ISPL_STEALMANA_5) != 0)
return _("hit steals 5% mana");
return "";
case IPL_STEALLIFE:
if ((x->_iFlags & ISPL_STEALLIFE_3) != 0)
/*xgettext:no-c-format*/ strcpy(tempstr, _("hit steals 3% life"));
if ((x->_iFlags & ISPL_STEALLIFE_5) != 0)
/*xgettext:no-c-format*/ strcpy(tempstr, _("hit steals 5% life"));
break;
if ((item._iFlags & ISPL_STEALLIFE_3) != 0)
return _("hit steals 3% life");
if ((item._iFlags & ISPL_STEALLIFE_5) != 0)
return _("hit steals 5% life");
return "";
case IPL_TARGAC:
strcpy(tempstr, _("penetrates target's armor"));
break;
return _("penetrates target's armor");
case IPL_FASTATTACK:
if ((x->_iFlags & ISPL_QUICKATTACK) != 0)
strcpy(tempstr, _("quick attack"));
if ((x->_iFlags & ISPL_FASTATTACK) != 0)
strcpy(tempstr, _("fast attack"));
if ((x->_iFlags & ISPL_FASTERATTACK) != 0)
strcpy(tempstr, _("faster attack"));
if ((x->_iFlags & ISPL_FASTESTATTACK) != 0)
strcpy(tempstr, _("fastest attack"));
break;
if ((item._iFlags & ISPL_QUICKATTACK) != 0)
return _("quick attack");
if ((item._iFlags & ISPL_FASTATTACK) != 0)
return _("fast attack");
if ((item._iFlags & ISPL_FASTERATTACK) != 0)
return _("faster attack");
if ((item._iFlags & ISPL_FASTESTATTACK) != 0)
return _("fastest attack");
return _("Another ability (NW)");
case IPL_FASTRECOVER:
if ((x->_iFlags & ISPL_FASTRECOVER) != 0)
strcpy(tempstr, _("fast hit recovery"));
if ((x->_iFlags & ISPL_FASTERRECOVER) != 0)
strcpy(tempstr, _("faster hit recovery"));
if ((x->_iFlags & ISPL_FASTESTRECOVER) != 0)
strcpy(tempstr, _("fastest hit recovery"));
break;
if ((item._iFlags & ISPL_FASTRECOVER) != 0)
return _("fast hit recovery");
if ((item._iFlags & ISPL_FASTERRECOVER) != 0)
return _("faster hit recovery");
if ((item._iFlags & ISPL_FASTESTRECOVER) != 0)
return _("fastest hit recovery");
return _("Another ability (NW)");
case IPL_FASTBLOCK:
strcpy(tempstr, _("fast block"));
break;
return _("fast block");
case IPL_DAMMOD:
strcpy(tempstr, fmt::format(ngettext("adds {:d} point to damage", "adds {:d} points to damage", x->_iPLDamMod), x->_iPLDamMod).c_str());
break;
return fmt::format(ngettext("adds {:d} point to damage", "adds {:d} points to damage", item._iPLDamMod), item._iPLDamMod);
case IPL_RNDARROWVEL:
strcpy(tempstr, _("fires random speed arrows"));
break;
return _("fires random speed arrows");
case IPL_SETDAM:
strcpy(tempstr, _("unusual item damage"));
break;
return _("unusual item damage");
case IPL_SETDUR:
strcpy(tempstr, _("altered durability"));
break;
return _("altered durability");
case IPL_FASTSWING:
strcpy(tempstr, _("Faster attack swing"));
break;
return _("Faster attack swing");
case IPL_ONEHAND:
strcpy(tempstr, _("one handed sword"));
break;
return _("one handed sword");
case IPL_DRAINLIFE:
strcpy(tempstr, _("constantly lose hit points"));
break;
return _("constantly lose hit points");
case IPL_RNDSTEALLIFE:
strcpy(tempstr, _("life stealing"));
break;
return _("life stealing");
case IPL_NOMINSTR:
strcpy(tempstr, _("no strength requirement"));
break;
return _("no strength requirement");
case IPL_INFRAVISION:
strcpy(tempstr, _("see with infravision"));
break;
return _("see with infravision");
case IPL_INVCURS:
strcpy(tempstr, " ");
break;
return " ";
case IPL_ADDACLIFE:
if (x->_iFMinDam == x->_iFMaxDam)
strcpy(tempstr, fmt::format(_("lightning damage: {:d}"), x->_iFMinDam).c_str());
if (item._iFMinDam == item._iFMaxDam)
return fmt::format(_("lightning damage: {:d}"), item._iFMinDam);
else
strcpy(tempstr, fmt::format(_("lightning damage: {:d}-{:d}"), x->_iFMinDam, x->_iFMaxDam).c_str());
break;
return fmt::format(_("lightning damage: {:d}-{:d}"), item._iFMinDam, item._iFMaxDam);
case IPL_ADDMANAAC:
strcpy(tempstr, _("charged bolts on hits"));
break;
return _("charged bolts on hits");
case IPL_FIRERESCLVL:
if (x->_iPLFR <= 0)
strcpy(tempstr, " ");
else if (x->_iPLFR >= 1)
strcpy(tempstr, fmt::format(_("Resist Fire: {:+d}%"), x->_iPLFR).c_str());
break;
if (item._iPLFR > 0)
return fmt::format(_("Resist Fire: {:+d}%"), item._iPLFR);
else
return " ";
case IPL_DEVASTATION:
strcpy(tempstr, _("occasional triple damage"));
break;
return _("occasional triple damage");
case IPL_DECAY:
/*xgettext:no-c-format*/ strcpy(tempstr, fmt::format(_("decaying {:+d}% damage"), x->_iPLDam).c_str());
break;
return fmt::format(_("decaying {:+d}% damage"), item._iPLDam);
case IPL_PERIL:
strcpy(tempstr, _("2x dmg to monst, 1x to you"));
break;
return _("2x dmg to monst, 1x to you");
case IPL_JESTERS:
/*xgettext:no-c-format*/ strcpy(tempstr, _("Random 0 - 500% damage"));
break;
return _("Random 0 - 500% damage");
case IPL_CRYSTALLINE:
/*xgettext:no-c-format*/ strcpy(tempstr, fmt::format(_("low dur, {:+d}% damage"), x->_iPLDam).c_str());
break;
return fmt::format(_("low dur, {:+d}% damage"), item._iPLDam);
case IPL_DOPPELGANGER:
strcpy(tempstr, fmt::format(_("to hit: {:+d}%, {:+d}% damage"), x->_iPLToHit, x->_iPLDam).c_str());
break;
return fmt::format(_("to hit: {:+d}%, {:+d}% damage"), item._iPLToHit, item._iPLDam);
case IPL_ACDEMON:
strcpy(tempstr, _("extra AC vs demons"));
break;
return _("extra AC vs demons");
case IPL_ACUNDEAD:
strcpy(tempstr, _("extra AC vs undead"));
break;
return _("extra AC vs undead");
case IPL_MANATOLIFE:
/*xgettext:no-c-format*/ strcpy(tempstr, _("50% Mana moved to Health"));
break;
return _("50% Mana moved to Health");
case IPL_LIFETOMANA:
/*xgettext:no-c-format*/ strcpy(tempstr, _("40% Health moved to Mana"));
break;
return _("40% Health moved to Mana");
default:
strcpy(tempstr, _("Another ability (NW)"));
break;
return _("Another ability (NW)");
}
}
@ -4048,96 +3982,93 @@ void DrawUniqueInfo(const Surface &out)
if (power.type == IPL_INVALID)
break;
rect.position.y += 2 * 12;
PrintItemPower(power.type, &curruitem);
DrawString(out, tempstr, rect, UiFlags::ColorWhite | UiFlags::AlignCenter);
DrawString(out, PrintItemPower(power.type, curruitem), rect, UiFlags::ColorWhite | UiFlags::AlignCenter);
}
}
void PrintItemDetails(Item *x)
void PrintItemDetails(const Item &item)
{
if (x->_iClass == ICLASS_WEAPON) {
if (x->_iMinDam == x->_iMaxDam) {
if (x->_iMaxDur == DUR_INDESTRUCTIBLE)
strcpy(tempstr, fmt::format(_("damage: {:d} Indestructible"), x->_iMinDam).c_str());
if (item._iClass == ICLASS_WEAPON) {
if (item._iMinDam == item._iMaxDam) {
if (item._iMaxDur == DUR_INDESTRUCTIBLE)
strcpy(tempstr, fmt::format(_("damage: {:d} Indestructible"), item._iMinDam).c_str());
else
strcpy(tempstr, fmt::format(_(/* TRANSLATORS: Dur: is durability */ "damage: {:d} Dur: {:d}/{:d}"), x->_iMinDam, x->_iDurability, x->_iMaxDur).c_str());
strcpy(tempstr, fmt::format(_(/* TRANSLATORS: Dur: is durability */ "damage: {:d} Dur: {:d}/{:d}"), item._iMinDam, item._iDurability, item._iMaxDur).c_str());
} else {
if (x->_iMaxDur == DUR_INDESTRUCTIBLE)
strcpy(tempstr, fmt::format(_("damage: {:d}-{:d} Indestructible"), x->_iMinDam, x->_iMaxDam).c_str());
if (item._iMaxDur == DUR_INDESTRUCTIBLE)
strcpy(tempstr, fmt::format(_("damage: {:d}-{:d} Indestructible"), item._iMinDam, item._iMaxDam).c_str());
else
strcpy(tempstr, fmt::format(_(/* TRANSLATORS: Dur: is durability */ "damage: {:d}-{:d} Dur: {:d}/{:d}"), x->_iMinDam, x->_iMaxDam, x->_iDurability, x->_iMaxDur).c_str());
strcpy(tempstr, fmt::format(_(/* TRANSLATORS: Dur: is durability */ "damage: {:d}-{:d} Dur: {:d}/{:d}"), item._iMinDam, item._iMaxDam, item._iDurability, item._iMaxDur).c_str());
}
AddPanelString(tempstr);
}
if (x->_iClass == ICLASS_ARMOR) {
if (x->_iMaxDur == DUR_INDESTRUCTIBLE)
strcpy(tempstr, fmt::format(_("armor: {:d} Indestructible"), x->_iAC).c_str());
if (item._iClass == ICLASS_ARMOR) {
if (item._iMaxDur == DUR_INDESTRUCTIBLE)
strcpy(tempstr, fmt::format(_("armor: {:d} Indestructible"), item._iAC).c_str());
else
strcpy(tempstr, fmt::format(_(/* TRANSLATORS: Dur: is durability */ "armor: {:d} Dur: {:d}/{:d}"), x->_iAC, x->_iDurability, x->_iMaxDur).c_str());
strcpy(tempstr, fmt::format(_(/* TRANSLATORS: Dur: is durability */ "armor: {:d} Dur: {:d}/{:d}"), item._iAC, item._iDurability, item._iMaxDur).c_str());
AddPanelString(tempstr);
}
if (x->_iMiscId == IMISC_STAFF && x->_iMaxCharges != 0) {
if (x->_iMinDam == x->_iMaxDam)
strcpy(tempstr, fmt::format(_(/* TRANSLATORS: dam: is damage Dur: is durability */ "dam: {:d} Dur: {:d}/{:d}"), x->_iMinDam, x->_iDurability, x->_iMaxDur).c_str());
if (item._iMiscId == IMISC_STAFF && item._iMaxCharges != 0) {
if (item._iMinDam == item._iMaxDam)
strcpy(tempstr, fmt::format(_(/* TRANSLATORS: dam: is damage Dur: is durability */ "dam: {:d} Dur: {:d}/{:d}"), item._iMinDam, item._iDurability, item._iMaxDur).c_str());
else
strcpy(tempstr, fmt::format(_(/* TRANSLATORS: dam: is damage Dur: is durability */ "dam: {:d}-{:d} Dur: {:d}/{:d}"), x->_iMinDam, x->_iMaxDam, x->_iDurability, x->_iMaxDur).c_str());
strcpy(tempstr, fmt::format(_("Charges: {:d}/{:d}"), x->_iCharges, x->_iMaxCharges).c_str());
strcpy(tempstr, fmt::format(_(/* TRANSLATORS: dam: is damage Dur: is durability */ "dam: {:d}-{:d} Dur: {:d}/{:d}"), item._iMinDam, item._iMaxDam, item._iDurability, item._iMaxDur).c_str());
strcpy(tempstr, fmt::format(_("Charges: {:d}/{:d}"), item._iCharges, item._iMaxCharges).c_str());
AddPanelString(tempstr);
}
if (x->_iPrePower != -1) {
PrintItemPower(x->_iPrePower, x);
AddPanelString(tempstr);
if (item._iPrePower != -1) {
AddPanelString(PrintItemPower(item._iPrePower, item));
}
if (x->_iSufPower != -1) {
PrintItemPower(x->_iSufPower, x);
AddPanelString(tempstr);
if (item._iSufPower != -1) {
AddPanelString(PrintItemPower(item._iSufPower, item));
}
if (x->_iMagical == ITEM_QUALITY_UNIQUE) {
if (item._iMagical == ITEM_QUALITY_UNIQUE) {
AddPanelString(_("unique item"));
ShowUniqueItemInfoBox = true;
curruitem = *x;
curruitem = item;
}
PrintItemInfo(*x);
PrintItemInfo(item);
}
void PrintItemDur(Item *x)
void PrintItemDur(const Item &item)
{
if (x->_iClass == ICLASS_WEAPON) {
if (x->_iMinDam == x->_iMaxDam) {
if (x->_iMaxDur == DUR_INDESTRUCTIBLE)
strcpy(tempstr, fmt::format(_("damage: {:d} Indestructible"), x->_iMinDam).c_str());
if (item._iClass == ICLASS_WEAPON) {
if (item._iMinDam == item._iMaxDam) {
if (item._iMaxDur == DUR_INDESTRUCTIBLE)
strcpy(tempstr, fmt::format(_("damage: {:d} Indestructible"), item._iMinDam).c_str());
else
strcpy(tempstr, fmt::format(_("damage: {:d} Dur: {:d}/{:d}"), x->_iMinDam, x->_iDurability, x->_iMaxDur).c_str());
strcpy(tempstr, fmt::format(_("damage: {:d} Dur: {:d}/{:d}"), item._iMinDam, item._iDurability, item._iMaxDur).c_str());
} else {
if (x->_iMaxDur == DUR_INDESTRUCTIBLE)
strcpy(tempstr, fmt::format(_("damage: {:d}-{:d} Indestructible"), x->_iMinDam, x->_iMaxDam).c_str());
if (item._iMaxDur == DUR_INDESTRUCTIBLE)
strcpy(tempstr, fmt::format(_("damage: {:d}-{:d} Indestructible"), item._iMinDam, item._iMaxDam).c_str());
else
strcpy(tempstr, fmt::format(_("damage: {:d}-{:d} Dur: {:d}/{:d}"), x->_iMinDam, x->_iMaxDam, x->_iDurability, x->_iMaxDur).c_str());
strcpy(tempstr, fmt::format(_("damage: {:d}-{:d} Dur: {:d}/{:d}"), item._iMinDam, item._iMaxDam, item._iDurability, item._iMaxDur).c_str());
}
AddPanelString(tempstr);
if (x->_iMiscId == IMISC_STAFF && x->_iMaxCharges > 0) {
strcpy(tempstr, fmt::format(_("Charges: {:d}/{:d}"), x->_iCharges, x->_iMaxCharges).c_str());
if (item._iMiscId == IMISC_STAFF && item._iMaxCharges > 0) {
strcpy(tempstr, fmt::format(_("Charges: {:d}/{:d}"), item._iCharges, item._iMaxCharges).c_str());
AddPanelString(tempstr);
}
if (x->_iMagical != ITEM_QUALITY_NORMAL)
if (item._iMagical != ITEM_QUALITY_NORMAL)
AddPanelString(_("Not Identified"));
}
if (x->_iClass == ICLASS_ARMOR) {
if (x->_iMaxDur == DUR_INDESTRUCTIBLE)
strcpy(tempstr, fmt::format(_("armor: {:d} Indestructible"), x->_iAC).c_str());
if (item._iClass == ICLASS_ARMOR) {
if (item._iMaxDur == DUR_INDESTRUCTIBLE)
strcpy(tempstr, fmt::format(_("armor: {:d} Indestructible"), item._iAC).c_str());
else
strcpy(tempstr, fmt::format(_("armor: {:d} Dur: {:d}/{:d}"), x->_iAC, x->_iDurability, x->_iMaxDur).c_str());
strcpy(tempstr, fmt::format(_("armor: {:d} Dur: {:d}/{:d}"), item._iAC, item._iDurability, item._iMaxDur).c_str());
AddPanelString(tempstr);
if (x->_iMagical != ITEM_QUALITY_NORMAL)
if (item._iMagical != ITEM_QUALITY_NORMAL)
AddPanelString(_("Not Identified"));
if (x->_iMiscId == IMISC_STAFF && x->_iMaxCharges > 0) {
strcpy(tempstr, fmt::format(_("Charges: {:d}/{:d}"), x->_iCharges, x->_iMaxCharges).c_str());
if (item._iMiscId == IMISC_STAFF && item._iMaxCharges > 0) {
strcpy(tempstr, fmt::format(_("Charges: {:d}/{:d}"), item._iCharges, item._iMaxCharges).c_str());
AddPanelString(tempstr);
}
}
if (IsAnyOf(x->_itype, ItemType::Ring, ItemType::Amulet))
if (IsAnyOf(item._itype, ItemType::Ring, ItemType::Amulet))
AddPanelString(_("Not Identified"));
PrintItemInfo(*x);
PrintItemInfo(item);
}
void UseItem(int pnum, item_misc_id mid, spell_id spl)

6
Source/items.h
Unescape View File

@ -472,10 +472,10 @@ void CheckIdentify(Player &player, int cii);
void DoRepair(Player &player, int cii);
void DoRecharge(Player &player, int cii);
void DoOil(Player &player, int cii);
void PrintItemPower(char plidx, Item *x);
[[nodiscard]] std::string PrintItemPower(char plidx, const Item &item);
void DrawUniqueInfo(const Surface &out);
void PrintItemDetails(Item *x);
void PrintItemDur(Item *x);
void PrintItemDetails(const Item &item);
void PrintItemDur(const Item &item);
void UseItem(int p, item_misc_id Mid, spell_id spl);
bool UseItemOpensHive(const Item &item, Point position);
bool UseItemOpensCrypt(const Item &item, Point position);

56
Source/stores.cpp
Unescape View File

@ -232,27 +232,25 @@ void AddItemListBackButton(bool selectable = false)
}
}
void PrintStoreItem(Item *x, int l, UiFlags flags)
void PrintStoreItem(const Item &item, int l, UiFlags flags)
{
char sstr[128];
sstr[0] = '\0';
if (x->_iIdentified) {
if (x->_iMagical != ITEM_QUALITY_UNIQUE) {
if (x->_iPrePower != -1) {
PrintItemPower(x->_iPrePower, x);
strcat(sstr, tempstr);
if (item._iIdentified) {
if (item._iMagical != ITEM_QUALITY_UNIQUE) {
if (item._iPrePower != -1) {
strcat(sstr, PrintItemPower(item._iPrePower, item).c_str());
}
}
if (x->_iSufPower != -1) {
PrintItemPower(x->_iSufPower, x);
if (item._iSufPower != -1) {
if (sstr[0] != '\0')
strcat(sstr, _(", "));
strcat(sstr, tempstr);
strcat(sstr, PrintItemPower(item._iSufPower, item).c_str());
}
}
if (x->_iMiscId == IMISC_STAFF && x->_iMaxCharges != 0) {
strcpy(tempstr, fmt::format(_("Charges: {:d}/{:d}"), x->_iCharges, x->_iMaxCharges).c_str());
if (item._iMiscId == IMISC_STAFF && item._iMaxCharges != 0) {
strcpy(tempstr, fmt::format(_("Charges: {:d}/{:d}"), item._iCharges, item._iMaxCharges).c_str());
if (sstr[0] != '\0')
strcat(sstr, _(", "));
strcat(sstr, tempstr);
@ -262,21 +260,21 @@ void PrintStoreItem(Item *x, int l, UiFlags flags)
l++;
}
sstr[0] = '\0';
if (x->_iClass == ICLASS_WEAPON)
strcpy(sstr, fmt::format(_("Damage: {:d}-{:d} "), x->_iMinDam, x->_iMaxDam).c_str());
if (x->_iClass == ICLASS_ARMOR)
strcpy(sstr, fmt::format(_("Armor: {:d} "), x->_iAC).c_str());
if (x->_iMaxDur != DUR_INDESTRUCTIBLE && x->_iMaxDur != 0) {
strcpy(tempstr, fmt::format(_("Dur: {:d}/{:d}, "), x->_iDurability, x->_iMaxDur).c_str());
if (item._iClass == ICLASS_WEAPON)
strcpy(sstr, fmt::format(_("Damage: {:d}-{:d} "), item._iMinDam, item._iMaxDam).c_str());
if (item._iClass == ICLASS_ARMOR)
strcpy(sstr, fmt::format(_("Armor: {:d} "), item._iAC).c_str());
if (item._iMaxDur != DUR_INDESTRUCTIBLE && item._iMaxDur != 0) {
strcpy(tempstr, fmt::format(_("Dur: {:d}/{:d}, "), item._iDurability, item._iMaxDur).c_str());
strcat(sstr, tempstr);
} else {
strcat(sstr, _("Indestructible, "));
}
if (x->_itype == ItemType::Misc)
if (item._itype == ItemType::Misc)
sstr[0] = '\0';
int8_t str = x->_iMinStr;
uint8_t mag = x->_iMinMag;
int8_t dex = x->_iMinDex;
int8_t str = item._iMinStr;
uint8_t mag = item._iMinMag;
int8_t dex = item._iMinDex;
if (str == 0 && mag == 0 && dex == 0) {
strcat(sstr, _("No required attributes"));
} else {
@ -340,7 +338,7 @@ void ScrollSmithBuy(int idx)
}
AddSTextVal(l, smithitem[idx]._iIvalue);
PrintStoreItem(&smithitem[idx], l + 1, itemColor);
PrintStoreItem(smithitem[idx], l + 1, itemColor);
stextdown = l;
idx++;
}
@ -392,7 +390,7 @@ void ScrollSmithPremiumBuy(int boughtitems)
UiFlags itemColor = premiumitems[idx].getTextColorWithStatCheck();
AddSText(20, l, premiumitems[idx]._iIName, itemColor, true);
AddSTextVal(l, premiumitems[idx]._iIvalue);
PrintStoreItem(&premiumitems[idx], l + 1, itemColor);
PrintStoreItem(premiumitems[idx], l + 1, itemColor);
stextdown = l;
} else {
l -= 4;
@ -486,7 +484,7 @@ void ScrollSmithSell(int idx)
AddSTextVal(l, storehold[idx]._ivalue);
}
PrintStoreItem(&storehold[idx], l + 1, itemColor);
PrintStoreItem(storehold[idx], l + 1, itemColor);
stextdown = l;
}
idx++;
@ -700,7 +698,7 @@ void ScrollWitchBuy(int idx)
}
AddSTextVal(l, witchitem[idx]._iIvalue);
PrintStoreItem(&witchitem[idx], l + 1, itemColor);
PrintStoreItem(witchitem[idx], l + 1, itemColor);
stextdown = l;
idx++;
}
@ -974,7 +972,7 @@ void StoreConfirm()
AddSText(20, 8, item._iName, itemColor, false);
AddSTextVal(8, item._iIvalue);
PrintStoreItem(&item, 9, itemColor);
PrintStoreItem(item, 9, itemColor);
switch (stextshold) {
case STORE_BBOY:
@ -1049,7 +1047,7 @@ void SStartBoyBuy()
AddSTextVal(10, boyitem._iIvalue - (boyitem._iIvalue / 4));
else
AddSTextVal(10, boyitem._iIvalue + (boyitem._iIvalue / 2));
PrintStoreItem(&boyitem, 11, itemColor);
PrintStoreItem(boyitem, 11, itemColor);
{
// Add a Leave button. Unlike the other item list back buttons,
@ -1098,7 +1096,7 @@ void ScrollHealerBuy(int idx)
AddSText(20, l, healitem[idx]._iName, itemColor, true);
AddSTextVal(l, healitem[idx]._iIvalue);
PrintStoreItem(&healitem[idx], l + 1, itemColor);
PrintStoreItem(healitem[idx], l + 1, itemColor);
stextdown = l;
idx++;
}
@ -1269,7 +1267,7 @@ void StartStorytellerIdentifyShow()
AddSText(0, 7, _("This item is:"), UiFlags::ColorWhite | UiFlags::AlignCenter, false);
AddSText(20, 11, item._iIName, itemColor, false);
PrintStoreItem(&item, 12, itemColor);
PrintStoreItem(item, 12, itemColor);
AddSText(0, 18, _("Done"), UiFlags::ColorWhite | UiFlags::AlignCenter, true);
}

Write Preview
Loading…
Cancel
Save