AVALANCHE: Move ControlCharacter enum to enums

8 files changed, 90 insertions, 78 deletions

diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp
index 74307e73ff..f415d9006c 100644
--- a/engines/avalanche/animation.cpp
+++ b/engines/avalanche/animation.cpp
@@ -224,7 +224,8 @@ void AnimationType::walk() {
 				break;
 			case kMagicUnfinished: {
 				bounce();
-				Common::String tmpStr = Common::String::format("%c%cSorry.%cThis place is not available yet!", Dialogs::kControlBell, Dialogs::kControlCenter, Dialogs::kControlRoman);
+				Common::String tmpStr = Common::String::format("%c%cSorry.%cThis place is not available yet!", 
+					kControlBell, kControlCenter, kControlRoman);
 				_anim->_vm->_dialogs->displayText(tmpStr);
 				}
 				break;
@@ -452,7 +453,7 @@ void Animation::catacombMove(byte ped) {
 		return;
 	case 1033:{ // Oubliette
 		_vm->flipRoom(kRoomOubliette, 1);
-		Common::String tmpStr = Common::String::format("Oh, NO!%c1%c", Dialogs::kControlRegister, Dialogs::kControlSpeechBubble);
+		Common::String tmpStr = Common::String::format("Oh, NO!%c1%c", kControlRegister, kControlSpeechBubble);
 		_vm->_dialogs->displayText(tmpStr);
 		}
 		return;
@@ -1198,7 +1199,7 @@ void Animation::stopWalking() {
 void Animation::hideInCupboard() {
 	if (_vm->_avvysInTheCupboard) {
 		if (_vm->_parser->_wearing == kObjectDummy) {
-			Common::String tmpStr = Common::String::format("%cAVVY!%cGet dressed first!", Dialogs::kControlItalic, Dialogs::kControlRoman);
+			Common::String tmpStr = Common::String::format("%cAVVY!%cGet dressed first!", kControlItalic, kControlRoman);
 			_vm->_dialogs->displayText(tmpStr);
 		} else {
 			_sprites[0]._visible = true;
@@ -1213,7 +1214,7 @@ void Animation::hideInCupboard() {
 		_sprites[0]._visible = false;
 		_vm->_userMovesAvvy = false;
 		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.", Dialogs::kControlParagraph);
+			"but dusty, cupboard. Hmmmm... you leave the door slightly open to avoid suffocation.", kControlParagraph);
 		_vm->_dialogs->displayText(tmpStr);
 		_vm->_avvysInTheCupboard = true;
 		_vm->_background->draw(-1, -1, 7);
diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
index 6451784180..26d7671078 100644
--- a/engines/avalanche/avalanche.cpp
+++ b/engines/avalanche/avalanche.cpp
@@ -393,9 +393,9 @@ bool AvalancheEngine::loadGame(const int16 slot) {
 	_background->update();
 
 	Common::String tmpStr = Common::String::format("%cLoaded: %c%s.ASG%c%c%c%s%c%csaved on %s.", 
-		Dialogs::kControlItalic, Dialogs::kControlRoman, description.c_str(), Dialogs::kControlCenter, 
-		Dialogs::kControlNewLine, Dialogs::kControlNewLine, _roomnName.c_str(), Dialogs::kControlNewLine, 
-		Dialogs::kControlNewLine, expandDate(t.tm_mday, t.tm_mon, t.tm_year).c_str());
+		kControlItalic, kControlRoman, description.c_str(), kControlCenter, kControlNewLine, 
+		kControlNewLine, _roomnName.c_str(), kControlNewLine, kControlNewLine, 
+		expandDate(t.tm_mday, t.tm_mon, t.tm_year).c_str());
 	_dialogs->displayText(tmpStr);
 
 	AnimationType *avvy = &_animation->_sprites[0];
diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index aa4f73d3ad..4f30b824d5 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -178,7 +178,7 @@ void Clock::update() { // TODO: Move variables from Gyro to here (or at least so
 	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!", 
-			Dialogs::kControlNewLine, Dialogs::kControlNewLine);
+			kControlNewLine, kControlNewLine);
 		_vm->_dialogs->displayText(tmpStr);
 	}
 	_oldHour = _hour;
@@ -1286,7 +1286,7 @@ void AvalancheEngine::checkClick() {
 			} else if ((396 <= cursorPos.x) && (cursorPos.x <= 483))
 				fxToggle();
 			else if ((535 <= cursorPos.x) && (cursorPos.x <= 640))
-				_mouseText.insertChar(Dialogs::kControlNewLine, 0);
+				_mouseText.insertChar(kControlNewLine, 0);
 		} else if (!_dropsOk)
 			_mouseText = Common::String(13) + _mouseText;
 	}
diff --git a/engines/avalanche/dialogs.cpp b/engines/avalanche/dialogs.cpp
index 926f6624b5..f3b2688600 100644
--- a/engines/avalanche/dialogs.cpp
+++ b/engines/avalanche/dialogs.cpp
@@ -836,7 +836,7 @@ void Dialogs::displayScrollChain(char block, byte point, bool report, bool bubbl
 
 	if (error) {
 		if (report) {
-			Common::String todisplay = Common::String::format("%cError accessing scroll %c%d", Dialogs::kControlBell, block, point);
+			Common::String todisplay = Common::String::format("%cError accessing scroll %c%d", kControlBell, block, point);
 			displayText(todisplay);
 		}
 		return;
@@ -928,7 +928,8 @@ void Dialogs::talkTo(byte whom) {
 				case 1: // Fallthrough is intended.
 				case 2: {
 					Common::String objStr = _vm->getItem(AvalancheEngine::kSpludwicksOrder[_vm->_givenToSpludwick]);
-					Common::String tmpStr = Common::String::format("Can you get me %s, please?%c2%c", objStr.c_str(), Dialogs::kControlRegister, Dialogs::kControlSpeechBubble);
+					Common::String tmpStr = Common::String::format("Can you get me %s, please?%c2%c", 
+						objStr.c_str(), kControlRegister, kControlSpeechBubble);
 					displayText(tmpStr);
 					}
 					return;
@@ -1002,7 +1003,7 @@ void Dialogs::talkTo(byte whom) {
 	bool noMatches = true;
 	for (int i = 0; i <= _vm->_animation->kSpriteNumbMax; i++) {
 		if (_vm->_animation->_sprites[i]._stat._acciNum == whom) {
-			Common::String tmpStr = Common::String::format("%c%c%c", Dialogs::kControlRegister, i + 49, Dialogs::kControlToBuffer);
+			Common::String tmpStr = Common::String::format("%c%c%c", kControlRegister, i + 49, kControlToBuffer);
 			displayText(tmpStr);
 			noMatches = false;
 			break;
@@ -1010,7 +1011,7 @@ void Dialogs::talkTo(byte whom) {
 	}
 
 	if (noMatches) {
-		Common::String tmpStr = Common::String::format("%c%c%c", Dialogs::kControlRegister, Dialogs::kControlRegister, Dialogs::kControlToBuffer);
+		Common::String tmpStr = Common::String::format("%c%c%c", kControlRegister, kControlRegister, kControlToBuffer);
 		displayText(tmpStr);
 	}
 
diff --git a/engines/avalanche/dialogs.h b/engines/avalanche/dialogs.h
index 9cd4e729d4..94ffaf9401 100644
--- a/engines/avalanche/dialogs.h
+++ b/engines/avalanche/dialogs.h
@@ -41,26 +41,6 @@ typedef void (Dialogs::*DialogFunctionType)();
 
 class Dialogs {
 public:
-	// Constants to replace the command characters from Pascal.
-	// For more information, see: https://github.com/urukgit/avalot/wiki/Scrolldrivers
-	enum ControlCharacter {
-		kControlSpeechBubble = 2, // ^B
-		kControlCenter = 3, // ^C
-		kControlToBuffer = 4, // ^D
-		kControlItalic = 6, // ^F
-		kControlBell = 7, // ^G
-		kControlBackspace = 8, // ^H
-		kControlInsertSpaces = 9, // ^I
-		kControlLeftJustified = 12, // ^L
-		kControlNewLine = 13, // ^M
-		kControlParagraph = 16, // ^P
-		kControlQuestion = 17, // ^Q
-		kControlRoman = 18, // ^R
-		kControlRegister = 19, // ^S
-		kControlNegative = 21, // ^U
-		kControlIcon = 22 // ^V
-	};
-
 	bool _aboutBox; // Is this the about box?
 	FontType _fonts[2];
 
diff --git a/engines/avalanche/enums.h b/engines/avalanche/enums.h
index 779bfb7e7c..155c9ac060 100644
--- a/engines/avalanche/enums.h
+++ b/engines/avalanche/enums.h
@@ -101,6 +101,26 @@ enum Magics {
 	kMagicOpenDoor // Opening door.
 };
 
+// Constants to replace the command characters from Pascal.
+// For more information, see: https://github.com/urukgit/avalot/wiki/Scrolldrivers
+enum ControlCharacter {
+	kControlSpeechBubble = 2, // ^B
+	kControlCenter = 3, // ^C
+	kControlToBuffer = 4, // ^D
+	kControlItalic = 6, // ^F
+	kControlBell = 7, // ^G
+	kControlBackspace = 8, // ^H
+	kControlInsertSpaces = 9, // ^I
+	kControlLeftJustified = 12, // ^L
+	kControlNewLine = 13, // ^M
+	kControlParagraph = 16, // ^P
+	kControlQuestion = 17, // ^Q
+	kControlRoman = 18, // ^R
+	kControlRegister = 19, // ^S
+	kControlNegative = 21, // ^U
+	kControlIcon = 22 // ^V
+};
+
 static const int16 kScreenWidth = 640;
 static const int16 kScreenHeight = 200;
 
diff --git a/engines/avalanche/parser.cpp b/engines/avalanche/parser.cpp
index cc65386b4f..115b5662e2 100644
--- a/engines/avalanche/parser.cpp
+++ b/engines/avalanche/parser.cpp
@@ -867,7 +867,8 @@ void Parser::parse() {
 			_polite = true;
 	}
 
-	if ((!unkString.empty()) && (_verb != kVerbCodeExam) && (_verb != kVerbCodeTalk) && (_verb != kVerbCodeSave) && (_verb != kVerbCodeLoad) && (_verb != kVerbCodeDir)) {
+	if ((!unkString.empty()) && (_verb != kVerbCodeExam) && (_verb != kVerbCodeTalk) && 
+		(_verb != kVerbCodeSave) && (_verb != kVerbCodeLoad) && (_verb != kVerbCodeDir)) {
 		Common::String tmpStr = Common::String::format("Sorry, but I have no idea what \"%s\" means. Can you rephrase it?", unkString.c_str());
 		_vm->_dialogs->displayText(tmpStr);
 		_weirdWord = true;
@@ -1031,7 +1032,7 @@ void Parser::inventory() {
 	}
 
 	if (_wearing == kNothing)
-		tmpStr += Common::String::format("...%c%c...and you're stark naked!", Dialogs::kControlNewLine, Dialogs::kControlNewLine);
+		tmpStr += Common::String::format("...%c%c...and you're stark naked!", kControlNewLine, kControlNewLine);
 	else
 		tmpStr += '.';
 
@@ -1249,7 +1250,8 @@ void Parser::putProc() {
 				_vm->_dialogs->displayText("That's a bit like shutting the stable door after the horse has bolted!");
 			else { // Put onion into wine?
 				if (_vm->_wineState != 3) {
-					Common::String tmpStr = Common::String::format("%cOignon au vin%c is a bit too strong for your tastes!", Dialogs::kControlItalic, Dialogs::kControlRoman);
+					Common::String tmpStr = Common::String::format("%cOignon au vin%c is a bit too strong for your tastes!",
+						kControlItalic, kControlRoman);
 					_vm->_dialogs->displayText(tmpStr);
 				} else { // Put onion into vinegar! Yes!
 					_vm->_onionInVinegar = true;
@@ -1311,7 +1313,7 @@ void Parser::putProc() {
 void Parser::notInOrder() {
 	Common::String itemStr = _vm->getItem(_vm->kSpludwicksOrder[_vm->_givenToSpludwick]);
 	Common::String tmpStr = Common::String::format("Sorry, I need the ingredients in the right order for this potion. " \
-		"What I need next is %s%c2%c", itemStr.c_str(), Dialogs::kControlRegister, Dialogs::kControlSpeechBubble);
+		"What I need next is %s%c2%c", itemStr.c_str(), kControlRegister, kControlSpeechBubble);
 	_vm->_dialogs->displayText(tmpStr);
 }
 
@@ -1512,7 +1514,7 @@ void Parser::getProc(char thing) {
  */
 void Parser::giveGeidaTheLute() {
 	if (_vm->_room != kRoomLustiesRoom) {
-		Common::String tmpStr = Common::String::format("Not yet. Try later!%c2%c", Dialogs::kControlRegister, Dialogs::kControlSpeechBubble);
+		Common::String tmpStr = Common::String::format("Not yet. Try later!%c2%c", kControlRegister, kControlSpeechBubble);
 		_vm->_dialogs->displayText(tmpStr);
 		return;
 	}
@@ -1546,7 +1548,7 @@ Common::String Parser::personSpeaks() {
 	}
 
 	if (_vm->getRoom(_person) != _vm->_room) {
-		return Common::String::format("%c1", Dialogs::kControlRegister); // Avvy himself!
+		return Common::String::format("%c1", kControlRegister); // Avvy himself!
 	}
 
 	bool found = false; // The _person we're looking for's code is in _person.
@@ -1554,7 +1556,7 @@ Common::String Parser::personSpeaks() {
 
 	for (int i = 0; i < _vm->_animation->kSpriteNumbMax; i++) {
 		if (_vm->_animation->_sprites[i]._quick && ((_vm->_animation->_sprites[i]._stat._acciNum + 149) == _person)) {
-			tmpStr += Common::String::format("%c%c", Dialogs::kControlRegister, '1' + i);
+			tmpStr += Common::String::format("%c%c", kControlRegister, '1' + i);
 			found = true;
 		}
 	}
@@ -1564,7 +1566,7 @@ Common::String Parser::personSpeaks() {
 
 	for (int i = 0; i < 16; i++) {
 		if ((_vm->kQuasipeds[i]._who == _person) && (_vm->kQuasipeds[i]._room == _vm->_room))
-			tmpStr += Common::String::format("%c%c", Dialogs::kControlRegister, 'A' + i);
+			tmpStr += Common::String::format("%c%c", kControlRegister, 'A' + i);
 	}
 
 	return tmpStr;
@@ -1572,7 +1574,7 @@ Common::String Parser::personSpeaks() {
 
 void Parser::heyThanks() {
 	Common::String tmpStr = personSpeaks();
-	tmpStr += Common::String::format("Hey, thanks!%c(But now, you've lost it!)", Dialogs::kControlSpeechBubble);
+	tmpStr += Common::String::format("Hey, thanks!%c(But now, you've lost it!)", kControlSpeechBubble);
 	_vm->_dialogs->displayText(tmpStr);
 	_vm->_objects[_thing - 1] = false;
 }
@@ -1601,7 +1603,8 @@ void Parser::doThat() {
 	&& (_verb != kVerbCodeLarrypass) && (_verb != kVerbCodePhaon) && (_verb != kVerbCodeBoss) && (_verb != kVerbCodeCheat) && (_verb != kVerbCodeRestart)
 	&& (_verb != kVerbCodeDir) && (_verb != kVerbCodeScore) && (_verb != kVerbCodeHiscores) && (_verb != kVerbCodeSmartAlec)) {
 		if (!_vm->_alive) {
-			_vm->_dialogs->displayText("You're dead, so don't talk. What are you, a ghost or something? Try restarting, or restoring a saved game!");
+			_vm->_dialogs->displayText("You're dead, so don't talk. What are you, a ghost or something? " \
+				"Try restarting, or restoring a saved game!");
 			return;
 		}
 		if (!_vm->_avvyIsAwake  && (_verb != kVerbCodeDie) && (_verb != kVerbCodeExpletive) && (_verb != kVerbCodeWake)) {
@@ -1617,8 +1620,11 @@ void Parser::doThat() {
 	case kVerbCodeOpen:
 		openDoor();
 		break;
-	case kVerbCodePause: { // Note that the original game doesn't care about the "O.K." box neither, it accepts clicks from everywhere on the screen to continue. Just like my code.
-		Common::String tmpStr = Common::String::format("Game paused.%c%c%cPress Enter, Esc, or click the mouse on the `O.K.\" box to continue.", Dialogs::kControlCenter, Dialogs::kControlNewLine, Dialogs::kControlNewLine);
+	case kVerbCodePause: { 
+		// Note that the original game doesn't care about the "O.K." box neither, it accepts
+		// clicks from everywhere on the screen to continue. Just like my code.
+		Common::String tmpStr = Common::String::format("Game paused.%c%c%cPress Enter, Esc, or click the mouse on the `O.K.\" " \
+			"box to continue.", kControlCenter, kControlNewLine, kControlNewLine);
 		_vm->_dialogs->displayText(tmpStr);
 		}
 		break;
@@ -1645,7 +1651,7 @@ void Parser::doThat() {
 	case kVerbCodeTalk:
 		if (_person == kPeoplePardon) {
 			if (_vm->_subjectNum == 99) { // They typed "say password".
-				Common::String tmpStr = Common::String::format("Yes, but what %cis%c the password?", Dialogs::kControlItalic, Dialogs::kControlRoman);
+				Common::String tmpStr = Common::String::format("Yes, but what %cis%c the password?", kControlItalic, kControlRoman);
 				_vm->_dialogs->displayText(tmpStr);
 			} else if (((1 <= _vm->_subjectNum) && (_vm->_subjectNum <= 49)) || (_vm->_subjectNum == 253) || (_vm->_subjectNum == 249)) {
 				_thats.deleteChar(0);
@@ -1789,7 +1795,7 @@ void Parser::doThat() {
 		if (!_polite)
 			_vm->_dialogs->displayText("How about a `please\", Avvy?");
 		else {
-			Common::String tmpStr = Common::String::format("%cC%cDo you really want to quit?", Dialogs::kControlRegister, Dialogs::kControlIcon);
+			Common::String tmpStr = Common::String::format("%cC%cDo you really want to quit?", kControlRegister, kControlIcon);
 			if (_vm->_dialogs->displayQuestion(tmpStr))
 				_vm->_letMeOut = true;
 		}
@@ -1802,12 +1808,12 @@ void Parser::doThat() {
 
 		Common::String toDisplay;
 		for (int i = 0; i < 7; i++)
-			toDisplay += Dialogs::kControlNewLine;
-		toDisplay = toDisplay + "LORD AVALOT D'ARGENT" + Dialogs::kControlCenter + Dialogs::kControlNewLine
-			+ "The medi\x91val descendant of" + Dialogs::kControlNewLine
-			+ "Denarius Avaricius Sextus" + Dialogs::kControlNewLine + Dialogs::kControlNewLine
-			+ "version " + kVersionNum + Dialogs::kControlNewLine + Dialogs::kControlNewLine + "Copyright \xEF "
-			+ kCopyright + ", Mark, Mike and Thomas Thurman." + Dialogs::kControlRegister + 'Y' + Dialogs::kControlIcon;
+			toDisplay += kControlNewLine;
+		toDisplay = toDisplay + "LORD AVALOT D'ARGENT" + kControlCenter + kControlNewLine
+			+ "The medi\x91val descendant of" + kControlNewLine
+			+ "Denarius Avaricius Sextus" + kControlNewLine + kControlNewLine
+			+ "version " + kVersionNum + kControlNewLine + kControlNewLine + "Copyright \xEF "
+			+ kCopyright + ", Mark, Mike and Thomas Thurman." + kControlRegister + 'Y' + kControlIcon;
 		_vm->_dialogs->displayText(toDisplay);
 		_vm->_dialogs->_aboutBox = false;
 		}
@@ -1898,8 +1904,9 @@ void Parser::doThat() {
 					_vm->incScore(3); // 3 points for playing your 1st game.
 
 				// A warning to the player that there should have been a mini-game. TODO: Remove it later!!!
-				_vm->_dialogs->displayText(Common::String("P.S.: There should have been the mini-game called \"Nim\", but I haven't implemented it yet: you win and get the lute automatically.")
-					+ Dialogs::kControlNewLine + Dialogs::kControlNewLine + "Peter (uruk)");
+				_vm->_dialogs->displayText(Common::String("P.S.: There should have been the mini-game called \"Nim\", " \
+					"but I haven't implemented it yet: you win and get the lute automatically.")
+					+ kControlNewLine + kControlNewLine + "Peter (uruk)");
 				break;
 			case kRoomMusicRoom:
 				playHarp();
@@ -1966,12 +1973,12 @@ void Parser::doThat() {
 			_vm->_dialogs->displayText("Hmm, I don't think anyone will notice...");
 			_vm->_timer->addTimer(4, Timer::kProcUrinate, Timer::kReasonGoToToilet);
 		} else {
-			Common::String tmpStr = Common::String::format("It would be %cVERY%c unwise to do that here, Avvy!", Dialogs::kControlItalic, Dialogs::kControlRoman);
+			Common::String tmpStr = Common::String::format("It would be %cVERY%c unwise to do that here, Avvy!", kControlItalic, kControlRoman);
 			_vm->_dialogs->displayText(tmpStr);
 		}
 		break;
 	case kVerbCodeCheat: {
-		Common::String tmpStr = Common::String::format("%cCheat mode now enabled.", Dialogs::kControlItalic);
+		Common::String tmpStr = Common::String::format("%cCheat mode now enabled.", kControlItalic);
 		_vm->_dialogs->displayText(tmpStr);
 		_vm->_cheat = true;
 		}
@@ -2005,19 +2012,20 @@ void Parser::doThat() {
 		switch (_sworeNum) {
 		case 0: {
 			Common::String tmpStr = Common::String::format("Avvy! Do you mind? There might be kids playing!%c%c" \
-				"(I shouldn't say it again, if I were you!)", Dialogs::kControlNewLine, Dialogs::kControlNewLine);
+				"(I shouldn't say it again, if I were you!)", kControlNewLine, kControlNewLine);
 			_vm->_dialogs->displayText(tmpStr);
 			}
 			break;
 		case 1: {
 			Common::String tmpStr = Common::String::format("You hear a distant rumble of thunder. Must you always" \
-				"do things I tell you not to?%c%cDon't do it again!", Dialogs::kControlNewLine, Dialogs::kControlNewLine);
+				"do things I tell you not to?%c%cDon't do it again!", kControlNewLine, kControlNewLine);
 			_vm->_dialogs->displayText(tmpStr);
 			}
 			break;
 		default: {
 			_vm->_pingo->zonk();
-			Common::String tmpStr = Common::String::format("A crack of lightning shoots from the sky, and fries you.%c%c(`Such is the anger of the gods, Avvy!\")", Dialogs::kControlNewLine, Dialogs::kControlNewLine);
+			Common::String tmpStr = Common::String::format("A crack of lightning shoots from the sky, and fries you." \
+				"%c%c(`Such is the anger of the gods, Avvy!\")", kControlNewLine, kControlNewLine);
 			_vm->_dialogs->displayText(tmpStr);
 			_vm->gameOver();
 			}
@@ -2055,7 +2063,7 @@ void Parser::doThat() {
 						_vm->incScore(3);
 
 					_vm->_background->draw(-1, -1, 11);
-					_vm->_dialogs->displayText(booze[_thing - 51] + ", please." + Dialogs::kControlRegister + '1' + Dialogs::kControlSpeechBubble);
+					_vm->_dialogs->displayText(booze[_thing - 51] + ", please." + kControlRegister + '1' + kControlSpeechBubble);
 					_vm->_drinking = _thing;
 
 					_vm->_background->draw(-1, -1, 9);
@@ -2080,7 +2088,7 @@ void Parser::doThat() {
 						}
 
 						_vm->_background->draw(-1, -1, 11);
-						Common::String tmpStr = Common::String::format("Wine, please.%c1%c", Dialogs::kControlRegister, Dialogs::kControlSpeechBubble);
+						Common::String tmpStr = Common::String::format("Wine, please.%c1%c", kControlRegister, kControlSpeechBubble);
 						_vm->_dialogs->displayText(tmpStr);
 						if (_alcoholLevel == 0)
 							_vm->incScore(3);
@@ -2199,7 +2207,9 @@ void Parser::doThat() {
 		_vm->gameOver();
 		break;
 	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->_dnascore, Dialogs::kControlCenter, Dialogs::kControlNewLine, Dialogs::kControlNewLine, Dialogs::kControlNewLine, rank().c_str(), Dialogs::kControlNewLine, Dialogs::kControlNewLine, totalTime().c_str());
+		Common::String tmpStr = Common::String::format("Your score is %d,%c%cout of a possible 128.%c%c " \
+			"This gives you a rank of %s.%c%c%s", _vm->_dnascore, kControlCenter, kControlNewLine, kControlNewLine, 
+			kControlNewLine, rank().c_str(), kControlNewLine, kControlNewLine, totalTime().c_str());
 		_vm->_dialogs->displayText(tmpStr);
 		}
 		break;
@@ -2266,7 +2276,7 @@ void Parser::doThat() {
 				break;
 			case kPeopleJacques: {
 				Common::String tmpStr = Common::String::format("Brother Jacques, Brother Jacques, are you asleep?%c1%c" \
-					"Hmmm... that doesn't seem to do any good...", Dialogs::kControlRegister, Dialogs::kControlSpeechBubble);
+					"Hmmm... that doesn't seem to do any good...", kControlRegister, kControlSpeechBubble);
 				_vm->_dialogs->displayText(tmpStr);
 				}
 				break;
@@ -2285,7 +2295,7 @@ void Parser::doThat() {
 		} else { // Default doodah.
 			_vm->dusk();
 			_vm->dawn();
-			Common::String tmpStr = Common::String::format("A few hours later...%cnothing much has happened...", Dialogs::kControlParagraph);
+			Common::String tmpStr = Common::String::format("A few hours later...%cnothing much has happened...", kControlParagraph);
 			_vm->_dialogs->displayText(tmpStr);
 		}
 		break;
@@ -2301,18 +2311,18 @@ void Parser::doThat() {
 		break;
 	case kVerbCodeHello: {
 		Common::String tmpStr = personSpeaks();
-		tmpStr += Common::String::format("Hello.%c", Dialogs::kControlSpeechBubble);
+		tmpStr += Common::String::format("Hello.%c", kControlSpeechBubble);
 		_vm->_dialogs->displayText(tmpStr);
 		}
 		break;
 	case kVerbCodeThanks: {
 		Common::String tmpStr = personSpeaks();
-		tmpStr += Common::String::format("That's OK.%c", Dialogs::kControlSpeechBubble);
+		tmpStr += Common::String::format("That's OK.%c", kControlSpeechBubble);
 		_vm->_dialogs->displayText(tmpStr);
 		}
 		break;
 	default:
-		Common::String tmpStr = Common::String::format("%cParser bug!", Dialogs::kControlBell);
+		Common::String tmpStr = Common::String::format("%cParser bug!", kControlBell);
 		_vm->_dialogs->displayText(tmpStr);
 	}
 }
diff --git a/engines/avalanche/timer.cpp b/engines/avalanche/timer.cpp
index ff5cf828c5..f34531734e 100644
--- a/engines/avalanche/timer.cpp
+++ b/engines/avalanche/timer.cpp
@@ -259,7 +259,7 @@ void Timer::toilet() {
 }
 
 void Timer::bang() {
-	Common::String tmpStr = Common::String::format("%c< BANG! >", Dialogs::kControlItalic);
+	Common::String tmpStr = Common::String::format("%c< BANG! >", kControlItalic);
 	_vm->_dialogs->displayText(tmpStr);
 	addTimer(30, kProcBang2, kReasonExplosion);
 }
@@ -360,8 +360,8 @@ void Timer::afterTheShootemup() {
 	_vm->refreshObjectList();
 
 	// Same as the added line above: TODO: Remove it later!!!
-	_vm->_dialogs->displayText(Common::String("P.S.: There should have been the mini-game called \"shoot em' up\", but I haven't implemented it yet: you get the crossbow automatically.")
-		+ Dialogs::kControlNewLine + Dialogs::kControlNewLine + "Peter (uruk)");
+	_vm->_dialogs->displayText(Common::String("P.S.: There should have been the mini-game called \"shoot em' up\", " \
+		"but I haven't implemented it yet: you get the crossbow automatically.") + kControlNewLine + kControlNewLine + "Peter (uruk)");
 
 #if 0
 	byte shootscore, gain;
@@ -548,7 +548,8 @@ void Timer::fallDownOubliette() {
 
 void Timer::meetAvaroid() {
 	if (_vm->_metAvaroid) {
-		Common::String tmpStr = Common::String::format("You can't expect to be %cthat%c lucky twice in a row!", Dialogs::kControlItalic, Dialogs::kControlRoman);
+		Common::String tmpStr = Common::String::format("You can't expect to be %cthat%c lucky twice in a row!",
+			kControlItalic, kControlRoman);
 		_vm->_dialogs->displayText(tmpStr);
 		_vm->gameOver();
 	} else {
@@ -633,7 +634,7 @@ void Timer::avvySitDown() {
 
 void Timer::ghostRoomPhew() {
 	Common::String tmpStr = Common::String::format("%cPHEW!%c You're glad to get out of %cthere!",
-		Dialogs::kControlItalic, Dialogs::kControlRoman, Dialogs::kControlItalic);
+		kControlItalic, kControlRoman, kControlItalic);
 	_vm->_dialogs->displayText(tmpStr);
 }
 
@@ -669,11 +670,10 @@ void Timer::avalotFalls() {
 		addTimer(3, kProcAvalotFalls, kReasonFallingOver);
 	} else {
 		Common::String toDisplay = Common::String::format("%c%c%c%c%c%c%c%c%c%c%c%c%cZ%c",
-			Dialogs::kControlNewLine, Dialogs::kControlNewLine, Dialogs::kControlNewLine,
-			Dialogs::kControlNewLine, Dialogs::kControlNewLine, Dialogs::kControlNewLine,
-			Dialogs::kControlInsertSpaces, Dialogs::kControlInsertSpaces, Dialogs::kControlInsertSpaces,
-			Dialogs::kControlInsertSpaces, Dialogs::kControlInsertSpaces, Dialogs::kControlInsertSpaces,
-			Dialogs::kControlRegister, Dialogs::kControlIcon);
+			kControlNewLine, kControlNewLine, kControlNewLine, kControlNewLine,
+			kControlNewLine, kControlNewLine, kControlInsertSpaces, kControlInsertSpaces,
+			kControlInsertSpaces, kControlInsertSpaces, kControlInsertSpaces,
+			kControlInsertSpaces, kControlRegister, kControlIcon);
 		_vm->_dialogs->displayText(toDisplay);
 	}
 }