diff options
| author | Strangerke | 2013-09-09 07:20:25 +0200 |
|---|---|---|
| committer | Strangerke | 2013-09-09 07:20:25 +0200 |
| commit | 524edfcbc358432dea7e8e96f4646dfe94b03596 (patch) | |
| tree | 41b47a0cc18bb28c5de82a07751dc385dca3f334 | |
| parent | 2d2ce624a9aa9d2b6c0a5e6d2e505510607cf956 (diff) | |
| download | scummvm-rg350-524edfcbc358432dea7e8e96f4646dfe94b03596.tar.gz scummvm-rg350-524edfcbc358432dea7e8e96f4646dfe94b03596.tar.bz2 scummvm-rg350-524edfcbc358432dea7e8e96f4646dfe94b03596.zip | |
AVALANCHE: Rework more strings (still WIP)
| -rw-r--r-- | engines/avalanche/acci2.cpp | 8 | ||||
| -rw-r--r-- | engines/avalanche/lucerna2.cpp | 3 | ||||
| -rw-r--r-- | engines/avalanche/scrolls2.cpp | 6 |
3 files changed, 9 insertions, 8 deletions
diff --git a/engines/avalanche/acci2.cpp b/engines/avalanche/acci2.cpp index cc2d5c4ec2..34768b4147 100644 --- a/engines/avalanche/acci2.cpp +++ b/engines/avalanche/acci2.cpp @@ -1917,10 +1917,10 @@ void Acci::doThat() { case kVerbCodeDie: _vm->_lucerna->gameOver(); break; - case kVerbCodeScore: - _vm->_scrolls->displayText(Common::String("Your score is ") + _vm->_gyro->intToStr(_vm->_gyro->_dna._score) + ',' + _vm->_scrolls->kControlCenter - + _vm->_scrolls->kControlNewLine + "out of a possible 128." + _vm->_scrolls->kControlNewLine + _vm->_scrolls->kControlNewLine - + "This gives you a rank of " + rank() + '.' + _vm->_scrolls->kControlNewLine + _vm->_scrolls->kControlNewLine + totalTime()); + case kVerbCodeScore: { + Common::String tmpStr = Common::String::format("Your score is %d,%c%cout of a possible 128.%c%cThis gives you a rank of %s.%c%c%s", _vm->_gyro->_dna._score, Scrolls::kControlCenter, Scrolls::kControlNewLine, Scrolls::kControlNewLine, Scrolls::kControlNewLine, rank().c_str(), Scrolls::kControlNewLine, Scrolls::kControlNewLine, totalTime().c_str()); + _vm->_scrolls->displayText(tmpStr); + } break; case kVerbCodePut: putProc(); diff --git a/engines/avalanche/lucerna2.cpp b/engines/avalanche/lucerna2.cpp index a99e74beef..a10c5e14ee 100644 --- a/engines/avalanche/lucerna2.cpp +++ b/engines/avalanche/lucerna2.cpp @@ -293,8 +293,7 @@ void Lucerna::loadRoom(byte num) { _vm->_graphics->fleshColors(); - Common::String filename; - filename = filename.format("place%d.avd", num); + Common::String filename = Common::String::format("place%d.avd", num); if (!file.open(filename)) { warning("AVALANCHE: Lucerna: File not found: %s", filename.c_str()); return; diff --git a/engines/avalanche/scrolls2.cpp b/engines/avalanche/scrolls2.cpp index ab895a1660..abc6ebdbf6 100644 --- a/engines/avalanche/scrolls2.cpp +++ b/engines/avalanche/scrolls2.cpp @@ -714,8 +714,10 @@ void Scrolls::callScrollDriver() { case 6: displayText(_vm->_gyro->_dna._spareEvening + kControlToBuffer); break; - case 9: - displayText(_vm->_gyro->intToStr(_vm->_gyro->_dna._catacombX) + ',' + _vm->_gyro->intToStr(_vm->_gyro->_dna._catacombY) + kControlToBuffer); + case 9: { + Common::String tmpStr = Common::String::format("%d,%d%c",_vm->_gyro->_dna._catacombX, _vm->_gyro->_dna._catacombY, kControlToBuffer); + displayText(tmpStr); + } break; case 10: switch (_vm->_gyro->_dna._boxContent) { |