AVALANCHE: Rework some more strings

3 files changed, 22 insertions, 18 deletions

diff --git a/engines/avalanche/acci2.cpp b/engines/avalanche/acci2.cpp
index b10a6bc2da..cc2d5c4ec2 100644
--- a/engines/avalanche/acci2.cpp
+++ b/engines/avalanche/acci2.cpp
@@ -364,8 +364,8 @@ void Acci::properNouns() {
 void Acci::sayIt() {
 	Common::String x = _vm->_parser->_inputText;
 	x.setChar(toupper(x[0]), 0);
-	_vm->_scrolls->displayText(Common::String(_vm->_scrolls->kControlRegister) + '1' + x
-		+ '.' + _vm->_scrolls->kControlSpeechBubble + _vm->_scrolls->kControlRegister + '2');
+	Common::String tmpStr = Common::String::format("%c1%s.%c%c2", Scrolls::kControlRegister, x.c_str(), Scrolls::kControlSpeechBubble, Scrolls::kControlRegister);
+	_vm->_scrolls->displayText(tmpStr);
 }
 
 void Acci::storeInterrogation(byte interrogation) {
@@ -480,7 +480,7 @@ void Acci::parse() {
 		if (!thisword.empty()) {
 			for (byte i = 0; i < 31; i++) {
 				if ((_vm->_gyro->_also[i][0] != 0) && (_vm->_parser->pos(',' + thisword, *_vm->_gyro->_also[i][0]) > -1)) {
-					_thats = _thats + Common::String(99 + i);
+					_thats += Common::String(99 + i);
 					notfound = false;
 				}
 			}
@@ -599,7 +599,8 @@ void Acci::parse() {
 	}
 
 	if ((!unkString.empty()) && (_verb != kVerbCodeExam) && (_verb != kVerbCodeTalk) && (_verb != kVerbCodeSave) && (_verb != kVerbCodeLoad) && (_verb != kVerbCodeDir)) {
-		_vm->_scrolls->displayText(Common::String("Sorry, but I have no idea what \"") + unkString + "\" means. Can you rephrase it?");
+		Common::String tmpStr = Common::String::format("Sorry, but I have no idea what \"%s\" means. Can you rephrase it?", unkString.c_str());
+		_vm->_scrolls->displayText(tmpStr);
 		_vm->_gyro->_weirdWord = true;
 	} else
 		_vm->_gyro->_weirdWord = false;
@@ -650,11 +651,12 @@ bool Acci::isPersonHere() { // Person equivalent of "holding".
 	if ((_person == kPardon) || (_person == 0) || (_vm->_gyro->_whereIs[_person - 150] == _vm->_gyro->_dna._room))
 		return true;
 	else {
+		Common::String tmpStr;
 		if (_person < 175)
-			_vm->_scrolls->displayText(Common::String('H') + _vm->_scrolls->kControlToBuffer);
+			tmpStr = Common::String::format("H%ce isn't around at the moment.", Scrolls::kControlToBuffer);
 		else
-			_vm->_scrolls->displayText(Common::String("Sh") + _vm->_scrolls->kControlToBuffer);
-		_vm->_scrolls->displayText("e isn't around at the moment.");
+			tmpStr = Common::String::format("Sh%ce isn't around at the moment.", Scrolls::kControlToBuffer);
+		_vm->_scrolls->displayText(tmpStr);
 		return false;
 	}
 }
diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp
index 9b7b0678b6..9e73ea73c0 100644
--- a/engines/avalanche/animation.cpp
+++ b/engines/avalanche/animation.cpp
@@ -213,11 +213,10 @@ void AnimationType::walk() {
 
 		if ((tc != 255) & (!_anim->_vm->_gyro->_doingSpriteRun)) {
 			switch (_anim->_vm->_gyro->_magics[tc]._operation) {
-			case Gyro::kMagicExclaim: {
+			case Gyro::kMagicExclaim:
 				bounce();
 				_anim->_mustExclaim = true;
 				_anim->_sayWhat = _anim->_vm->_gyro->_magics[tc]._data;
-				}
 				break;
 			case Gyro::kMagicBounce:
 				bounce();
@@ -227,7 +226,8 @@ void AnimationType::walk() {
 				break;
 			case Gyro::kMagicUnfinished: {
 				bounce();
-				_anim->_vm->_scrolls->displayText("\7Sorry.\3\rThis place is not available yet!");
+				Common::String tmpStr = Common::String::format("%cSorry.%cThis place is not available yet!", Scrolls::kControlBell, Scrolls::kControlCenter, Scrolls::kControlRoman);
+				_anim->_vm->_scrolls->displayText(tmpStr);
 				}
 				break;
 			case Gyro::kMagicSpecial:
diff --git a/engines/avalanche/lucerna2.cpp b/engines/avalanche/lucerna2.cpp
index 390c13bfa9..a99e74beef 100644
--- a/engines/avalanche/lucerna2.cpp
+++ b/engines/avalanche/lucerna2.cpp
@@ -71,10 +71,12 @@ void Clock::update() { // TODO: Move variables from Gyro to here (or at least so
 	if (_oldMinute != _minute)
 		plotHands();
 
-	if ((_hour == 0) && (_oldHour != 0) && (_oldHour != 17717))
-		_vm->_scrolls->displayText(Common::String("Good morning!") + _vm->_scrolls->kControlNewLine + _vm->_scrolls->kControlNewLine
-		+ "Yes, it's just past midnight. Are you having an all-night Avvy session? Glad you like the game that much!");
-
+	if ((_hour == 0) && (_oldHour != 0) && (_oldHour != 17717)) {
+		Common::String tmpStr = Common::String::format("Good morning!%c%cYes, it's just past " \
+			"midnight. Are you having an all-night Avvy session? Glad you like the game that much!", 
+			Scrolls::kControlNewLine, Scrolls::kControlNewLine);
+		_vm->_scrolls->displayText(tmpStr);
+	}
 	_oldHour = _hour;
 	_oldHourAngle = _hourAngle;
 	_oldMinute = _minute;
@@ -147,10 +149,10 @@ void Lucerna::init() {
  */
 void Lucerna::callVerb(byte id) {
 	if (id == _vm->_acci->kPardon) {
-		_vm->_scrolls->displayText(Common::String("The f5 key lets you do a particular action in certain ") +
-			"situations. However, at the moment there is nothing " +
-			"assigned to it. You may press alt-A to see what the " +
-			"current setting of this key is.");
+		Common::String tmpStr = Common::String::format("The f5 key lets you do a particular action in certain " \
+			"situations. However, at the moment there is nothing assigned to it. You may press alt-A to see " \
+			"what the current setting of this key is.");
+		_vm->_scrolls->displayText(tmpStr);
 	} else {
 		_vm->_gyro->_weirdWord = false;
 		_vm->_acci->_polite = true;