diff options
| author | Strangerke | 2013-09-08 20:24:09 +0200 |
|---|---|---|
| committer | Strangerke | 2013-09-08 20:24:09 +0200 |
| commit | cb66911ed2d9c0c19bf2ecec3eb71d398e5a94b7 (patch) | |
| tree | 44b485557c60a07c24c34d201b87a6965b8bf3bd /engines | |
| parent | f33ba719245a8da967ef5de414ecaa35d39df7e1 (diff) | |
| download | scummvm-rg350-cb66911ed2d9c0c19bf2ecec3eb71d398e5a94b7.tar.gz scummvm-rg350-cb66911ed2d9c0c19bf2ecec3eb71d398e5a94b7.tar.bz2 scummvm-rg350-cb66911ed2d9c0c19bf2ecec3eb71d398e5a94b7.zip | |
AVALANCHE: Rework more strings in Scroll2
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/avalanche/scrolls2.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/engines/avalanche/scrolls2.cpp b/engines/avalanche/scrolls2.cpp index 30e5bc4d26..d4cd5b1f3a 100644 --- a/engines/avalanche/scrolls2.cpp +++ b/engines/avalanche/scrolls2.cpp @@ -561,18 +561,20 @@ Common::String Scrolls::displayMoney() { Common::String result; if (_vm->_gyro->_dna._money < 12) { // just pence - result = _vm->_gyro->intToStr(_vm->_gyro->_dna._money) + 'd'; + result = Common::String::format("%dd", _vm->_gyro->_dna._money); } else if (_vm->_gyro->_dna._money < 240) { // shillings & pence - result = _vm->_gyro->intToStr(_vm->_gyro->_dna._money / 12) + '/'; if ((_vm->_gyro->_dna._money % 12) == 0) - result = result + '-'; + result = Common::String::format("%d/-", _vm->_gyro->_dna._money / 12); else - result = result + _vm->_gyro->intToStr(_vm->_gyro->_dna._money % 12); - } else // L, s & d - result = Common::String('\x9C') + _vm->_gyro->intToStr(_vm->_gyro->_dna._money / 240) + '.' + _vm->_gyro->intToStr((_vm->_gyro->_dna._money / 12) % 20) - + '.' + _vm->_gyro->intToStr(_vm->_gyro->_dna._money % 12); - if (_vm->_gyro->_dna._money > 12) - result = result + " (that's " + _vm->_gyro->intToStr(_vm->_gyro->_dna._money) + "d)"; + result = Common::String::format("%d/%d", _vm->_gyro->_dna._money / 12, _vm->_gyro->_dna._money % 12); + } else { // L, s & d + result = Common::String::format("\x9C%d.%d.%d", _vm->_gyro->_dna._money / 240, (_vm->_gyro->_dna._money / 12) % 20, + _vm->_gyro->_dna._money % 12); + } + if (_vm->_gyro->_dna._money > 12) { + Common::String extraStr = Common::String::format(" (that's %dd)", _vm->_gyro->_dna._money); + result += extraStr; + } return result; } @@ -813,14 +815,12 @@ void Scrolls::loadFont() { } void Scrolls::musicalScroll() { - displayText(Common::String("To play the harp...") + kControlNewLine + kControlNewLine + "Use these keys:" + + kControlNewLine - + kControlInsertSpaces + "Q W E R T Y U I O P [ ]" + kControlNewLine + kControlNewLine + "Or press Enter to stop playing." - + kControlToBuffer); + Common::String tmpStr = Common::String::format("To play the harp...%c%cUse these keys:%c%cQ W E R T Y U I O P [ ]%c%cOr press Enter to stop playing.%c", + kControlNewLine, kControlNewLine, kControlNewLine, kControlInsertSpaces, kControlNewLine, kControlNewLine, kControlToBuffer); + displayText(tmpStr); _vm->_lucerna->spriteRun(); - drawScroll(&Avalanche::Scrolls::scrollModeMusic); - resetScroll(); } |