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

MM: MM1: Fix display of a bunch of other text

Browse Source
This commit is contained in:
Paul Gilbert 2023-03-27 21:26:30 -07:00
parent 186bfe2755
commit 9ec204bbb0
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
engines/mm/mm1/views_enh/combat.cpp
View File

@ -119,7 +119,7 @@ void Combat::draw() {
delaySeconds(1);
return;
case MONSTER_ADVANCES:
writeString(0, 20, _monsterName);
writeBottomText(0, 0, _monsterName);
writeString(STRING["dialogs.combat.advances"]);
writeSpaces(30);
writeRound();
@ -463,9 +463,8 @@ void Combat::writeAllOptions() {
}
void Combat::writeDelaySelect() {
error("TODO: delay select");
writeString(0, 20, STRING["dialogs.combat.set_delay"]);
writeString(0, 23, Common::String::format(
writeBottomText(0, 0, STRING["dialogs.combat.set_delay"]);
writeBottomText(0, 3, Common::String::format(
STRING["dialogs.combat.delay_currently"].c_str(),
g_globals->_delay));
}
@ -794,7 +793,7 @@ void Combat::writeInfiltration() {
STRING["dialogs.combat.infiltration"].c_str());
resetBottom();
writeString(0, 20, line);
writeBottomText(0, 0, line);
Sound::sound(SOUND_2);
Sound::sound(SOUND_2);
}
@ -806,13 +805,13 @@ void Combat::writeWaitsForOpening() {
);
resetBottom();
writeString(0, 20, line);
writeBottomText(0, 0, line);
}
void Combat::writeSpellResult() {
for (uint i = 0; i < _spellResult._lines.size(); ++i) {
const Line &l = _spellResult._lines[i];
writeString(l.x, l.y + 20, l._text);
writeBottomText(l.x, l.y, l._text);
}
}
@ -889,7 +888,7 @@ void Combat::writeCharAttackDamage() {
void Combat::writeCharAttackNoEffect() {
resetBottom();
writeString(0, 20, Common::String::format("%s %s %s",
writeBottomText(0, 0, Common::String::format("%s %s %s",
g_globals->_currCharacter->_name,
STRING[_isShooting ? "dialogs.combat.shoots" :
"dialogs.combat.attacks"].c_str(),
@ -897,7 +896,7 @@ void Combat::writeCharAttackNoEffect() {
));
_isShooting = false;
writeString(0, 21, STRING["dialogs.combat.weapon_no_effect"]);
writeBottomText(0, 1, STRING["dialogs.combat.weapon_no_effect"]);
}
Common::String Combat::getAttackString() {