libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 13:50:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MM: MM1: Remove more deprecated name formatting

Browse Source
This commit is contained in:
Paul Gilbert 2023-02-04 21:19:22 -08:00
parent 0edaaf0265
commit a91ba40fb1
5 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/mm/mm1/data/character.cpp
View File

@ -593,10 +593,6 @@ bool Character::hasItem(byte itemId) const {
_equipped.indexOf(itemId) != -1;
}
Common::String Character::getDisplayName() const {
return Common::String::format("|%s|", _name);
}
#define PERF16(x) ((x & 0xff) + ((x >> 8) & 0xff))
#define PERF32(x) ((x & 0xff) + ((x >> 8) & 0xff) + \
((x >> 16) & 0xff) + ((x >> 24) & 0xff))

5
engines/mm/mm1/data/character.h
View File

@ -526,11 +526,6 @@ struct Character : public PrimaryAttributes {
*/
bool hasItem(byte itemId) const;
/**
* Return a display version of the character's name
*/
Common::String getDisplayName() const;
/**
* Gets the numeric value of every property a character
* has and totals it up to give a stupid 'performance'

6
engines/mm/mm1/game/monster_touch.cpp
View File

@ -228,7 +228,7 @@ bool MonsterTouch::action14(Common::String &line) {
if (canPerform(3) && isCharAffected()) {
setCondition(BAD_CONDITION | STONE);
line = Common::String::format("%s %s",
c.getDisplayName().c_str(),
c._name,
STRING["monster_actions.turned_to_stone"].c_str()
);
return true;
@ -280,7 +280,7 @@ bool MonsterTouch::action17(Common::String &line) {
if (canPerform(3) && isCharAffected()) {
setCondition(BAD_CONDITION | DEAD);
line = Common::String::format("%s %s",
c.getDisplayName().c_str(),
c._name,
STRING["monster_actions.is_killed"].c_str()
);
return true;
@ -368,7 +368,7 @@ bool MonsterTouch::action23(Common::String &line) {
setCondition(ERADICATED);
line = Common::String::format("%s %s",
c.getDisplayName().c_str(),
c._name,
STRING["monster_actions.is_eradicated"].c_str()
);

2
engines/mm/mm1/game/spells_monsters.cpp
View File

@ -446,7 +446,7 @@ bool SpellsMonsters::casts() {
}
void SpellsMonsters::addCharName() {
add(g_globals->_currCharacter->getDisplayName());
add(g_globals->_currCharacter->_name);
}
void SpellsMonsters::damageRandomChar() {

4
engines/mm/mm1/views/search.cpp
View File

@ -358,7 +358,7 @@ void Search::drawTreasure() {
writeString(0, _lineNum++, Common::String::format(
STRING["dialogs.search.found_gems"].c_str(),
c.getDisplayName().c_str(),
c._name,
gems));
c._gems = MIN((int)c._gems + gems, 0xffff);
}
@ -387,7 +387,7 @@ void Search::drawItem() {
// Add line for found item
writeString(0, _lineNum++, Common::String::format(
STRING["dialogs.search.found_item"].c_str(),
c.getDisplayName().c_str(),
c._name,
item->_name.c_str()
));