diff options
author | Strangerke | 2013-09-08 23:13:58 +0200 |
---|---|---|
committer | Strangerke | 2013-09-08 23:13:58 +0200 |
commit | f7bce3bede1c48efcb92aee26ff7e26158fa99ab (patch) | |
tree | 14326fed93f18ff3f9b07aed27b5770334db6bcf | |
parent | e77db05208bede59f9a3aa33ba8c3b175e48b0fc (diff) | |
download | scummvm-rg350-f7bce3bede1c48efcb92aee26ff7e26158fa99ab.tar.gz scummvm-rg350-f7bce3bede1c48efcb92aee26ff7e26158fa99ab.tar.bz2 scummvm-rg350-f7bce3bede1c48efcb92aee26ff7e26158fa99ab.zip |
AVALANCHE: Rework some more strings
-rw-r--r-- | engines/avalanche/acci2.cpp | 17 | ||||
-rw-r--r-- | engines/avalanche/animation.cpp | 18 | ||||
-rw-r--r-- | engines/avalanche/timer.cpp | 13 |
3 files changed, 28 insertions, 20 deletions
diff --git a/engines/avalanche/acci2.cpp b/engines/avalanche/acci2.cpp index 1c10a36fe3..b10a6bc2da 100644 --- a/engines/avalanche/acci2.cpp +++ b/engines/avalanche/acci2.cpp @@ -270,9 +270,9 @@ Common::String Acci::totalTime() { Common::String result = "You've been playing for "; if (h > 0) - result = result + _vm->_gyro->intToStr(h) + " hours, "; + result += _vm->_gyro->intToStr(h) + " hours, "; if ((m > 0) || (h != 0)) - result = result + _vm->_gyro->intToStr(m) + " minutes and "; + result += _vm->_gyro->intToStr(m) + " minutes and "; return result + _vm->_gyro->intToStr(s) + " seconds."; } @@ -308,12 +308,15 @@ void Acci::displayWhat(byte target, bool animate, bool &ambiguous) { else _vm->_scrolls->displayText("What?"); } else { - if (animate) - _vm->_scrolls->displayText(Common::String("{ ") + _vm->_gyro->getName(target) + " }"); - else { + if (animate) { + Common::String tmpStr = Common::String::format("{ %s }", _vm->_gyro->getName(target).c_str()); + _vm->_scrolls->displayText(tmpStr); + } else { Common::String z = _vm->_gyro->getItem(target); - if (z != "") - _vm->_scrolls->displayText(Common::String("{ ") + z + " }"); + if (z != "") { + Common::String tmpStr = Common::String::format("{ %s }", z.c_str()); + _vm->_scrolls->displayText(tmpStr); + } } } } diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp index d3f66ede09..9b7b0678b6 100644 --- a/engines/avalanche/animation.cpp +++ b/engines/avalanche/animation.cpp @@ -446,9 +446,11 @@ void Animation::catacombMove(byte ped) { flipRoom(r__lustiesroom, 4); _vm->_scrolls->displayText("Phew! Nice to be out of there!"); return; - case 1033: // Oubliette + case 1033:{ // Oubliette flipRoom(r__oubliette, 1); - _vm->_scrolls->displayText(Common::String("Oh, NO!") + _vm->_scrolls->kControlRegister + '1' + _vm->_scrolls->kControlSpeechBubble); + Common::String tmpStr = Common::String::format("Oh, NO!%c1%c", Scrolls::kControlRegister, Scrolls::kControlSpeechBubble); + _vm->_scrolls->displayText(tmpStr); + } return; case 4: flipRoom(r__geidas, 1); @@ -1290,9 +1292,10 @@ void Animation::stopWalking() { */ void Animation::hideInCupboard() { if (_vm->_gyro->_dna._avvysInTheCupboard) { - if (_vm->_gyro->_dna._wearing == Acci::kNothing) - _vm->_scrolls->displayText(Common::String(_vm->_scrolls->kControlItalic) + "AVVY!" + _vm->_scrolls->kControlRoman + "Get dressed first!"); - else { + if (_vm->_gyro->_dna._wearing == Acci::kNothing) { + Common::String tmpStr = Common::String::format("%cAVVY!%cGet dressed first!", Scrolls::kControlItalic, Scrolls::kControlRoman); + _vm->_scrolls->displayText(tmpStr); + } else { _sprites[0]._visible = true; _vm->_gyro->_dna._userMovesAvvy = true; appearPed(1, 3); // Walk out of the cupboard. @@ -1306,8 +1309,9 @@ void Animation::hideInCupboard() { // Not hiding in the cupboard _sprites[0]._visible = false; _vm->_gyro->_dna._userMovesAvvy = false; - _vm->_scrolls->displayText(Common::String("You walk into the room...") + _vm->_scrolls->kControlParagraph - + "It seems to be an empty, but dusty, cupboard. Hmmmm... you leave the door slightly open to avoid suffocation."); + Common::String tmpStr = Common::String::format("You walk into the room...%cIt seems to be an empty, " \ + "but dusty, cupboard. Hmmmm... you leave the door slightly open to avoid suffocation.", Scrolls::kControlParagraph); + _vm->_scrolls->displayText(tmpStr); _vm->_gyro->_dna._avvysInTheCupboard = true; _vm->_celer->drawBackgroundSprite(-1, -1, 8); } diff --git a/engines/avalanche/timer.cpp b/engines/avalanche/timer.cpp index 883e1a25a4..eaa2211224 100644 --- a/engines/avalanche/timer.cpp +++ b/engines/avalanche/timer.cpp @@ -264,7 +264,8 @@ void Timer::toilet() { } void Timer::bang() { - _vm->_scrolls->displayText(Common::String(_vm->_scrolls->kControlItalic) + "< BANG! >"); + Common::String tmpStr = Common::String::format("%c< BANG! >", Scrolls::kControlItalic); + _vm->_scrolls->displayText(tmpStr); addTimer(30, kProcBang2, kReasonExplosion); } @@ -545,8 +546,8 @@ void Timer::fallDownOubliette() { void Timer::meetAvaroid() { if (_vm->_gyro->_dna._metAvaroid) { - _vm->_scrolls->displayText(Common::String("You can't expect to be ") + _vm->_scrolls->kControlItalic + "that" - + _vm->_scrolls->kControlRoman + " lucky twice in a row!"); + Common::String tmpStr = Common::String::format("You can't expect to be %cthat%c lucky twice in a row!", Scrolls::kControlItalic, Scrolls::kControlRoman); + _vm->_scrolls->displayText(tmpStr); _vm->_lucerna->gameOver(); } else { _vm->_visa->displayScrollChain('Q', 60); @@ -617,8 +618,8 @@ void Timer::avvySitDown() { } void Timer::ghostRoomPhew() { - _vm->_scrolls->displayText(Common::String(_vm->_scrolls->kControlItalic) + "PHEW!" + _vm->_scrolls->kControlRoman - + " You're glad to get out of " + _vm->_scrolls->kControlItalic + "there!"); + Common::String tmpStr = Common::String::format("%cPHEW!%c You're glad to get out of %cthere!", Scrolls::kControlItalic, Scrolls::kControlRoman, Scrolls::kControlItalic); + _vm->_scrolls->displayText(tmpStr); } void Timer::arkataShouts() { @@ -656,7 +657,7 @@ void Timer::avalotFalls() { toDisplay += _vm->_scrolls->kControlNewLine; for (byte i = 0; i < 6; i++) toDisplay += _vm->_scrolls->kControlInsertSpaces; - toDisplay = toDisplay + _vm->_scrolls->kControlRegister + 'Z' + _vm->_scrolls->kControlIcon; + toDisplay += _vm->_scrolls->kControlRegister + 'Z' + _vm->_scrolls->kControlIcon; _vm->_scrolls->displayText(toDisplay); } } |