AVALANCHE: Make the call of displayScrollChain() a bit more consistent

1 files changed, 43 insertions, 43 deletions

diff --git a/engines/avalanche/parser.cpp b/engines/avalanche/parser.cpp
index f43ba61dcf..b4c918c2dc 100644
--- a/engines/avalanche/parser.cpp
+++ b/engines/avalanche/parser.cpp
@@ -743,7 +743,7 @@ void Parser::storeInterrogation(byte interrogation) {
 		if (!_vm->_spareEvening.empty())
 			_vm->_spareEvening.clear();
 		_vm->_spareEvening = _inputText;
-		_vm->_dialogs->displayScrollChain('z', 5); // His closing statement...
+		_vm->_dialogs->displayScrollChain('Z', 5); // His closing statement...
 		_vm->_animation->_sprites[1]->walkTo(3); // The end of the drawbridge
 		_vm->_animation->_sprites[1]->_vanishIfStill = true; // Then go away!
 		_vm->_magics[1]._operation = kMagicNothing;
@@ -967,29 +967,29 @@ void Parser::examineObject() {
 		switch (_vm->_wineState) {
 		case 1:
 			// Normal examine wine scroll
-			_vm->_dialogs->displayScrollChain('t', 1);
+			_vm->_dialogs->displayScrollChain('T', 1);
 			break;
 		case 2:
 			// Bad wine
-			_vm->_dialogs->displayScrollChain('d', 6);
+			_vm->_dialogs->displayScrollChain('D', 6);
 			break;
 		case 3:
 			// Vinegar
-			_vm->_dialogs->displayScrollChain('d', 7);
+			_vm->_dialogs->displayScrollChain('D', 7);
 			break;
 		}
 		break;
 	case kObjectOnion:
 		if (_vm->_rottenOnion)
 			// Yucky onion
-			_vm->_dialogs->displayScrollChain('q', 21);
+			_vm->_dialogs->displayScrollChain('Q', 21);
 		else
 			// Normal onion
-			_vm->_dialogs->displayScrollChain('t', 18);
+			_vm->_dialogs->displayScrollChain('T', 18);
 		break;
 	default:
 		// Ordinarily
-		_vm->_dialogs->displayScrollChain('t', _thing);
+		_vm->_dialogs->displayScrollChain('T', _thing);
 	}
 }
 
@@ -1151,7 +1151,7 @@ void Parser::swallow() {
 		case 2:
 		case 3:
 			// You can't drink it!
-			_vm->_dialogs->displayScrollChain('d', 8);
+			_vm->_dialogs->displayScrollChain('D', 8);
 			break;
 		}
 		break;
@@ -1236,37 +1236,37 @@ void Parser::lookAround() {
 	switch (_vm->_room) {
 	case kRoomSpludwicks:
 		if (_vm->_avariciusTalk > 0)
-			_vm->_dialogs->displayScrollChain('q', 23);
+			_vm->_dialogs->displayScrollChain('Q', 23);
 		else
 			peopleInRoom();
 		break;
 	case kRoomRobins:
 		if (_vm->_tiedUp)
-			_vm->_dialogs->displayScrollChain('q', 38);
+			_vm->_dialogs->displayScrollChain('Q', 38);
 		if (_vm->_mushroomGrowing)
-			_vm->_dialogs->displayScrollChain('q', 55);
+			_vm->_dialogs->displayScrollChain('Q', 55);
 		break;
 	case kRoomInsideCardiffCastle:
 		if (!_vm->_takenPen)
-			_vm->_dialogs->displayScrollChain('q', 49);
+			_vm->_dialogs->displayScrollChain('Q', 49);
 		break;
 	case kRoomLustiesRoom:
 		if (_vm->_lustieIsAsleep)
-			_vm->_dialogs->displayScrollChain('q', 65);
+			_vm->_dialogs->displayScrollChain('Q', 65);
 		break;
 	case kRoomCatacombs:
 		switch (_vm->_catacombY * 256 + _vm->_catacombX) {
 		case 258 :
 			// Inside art gallery.
-			_vm->_dialogs->displayScrollChain('q', 80);
+			_vm->_dialogs->displayScrollChain('Q', 80);
 			break;
 		case 514 :
 			// Outside ditto.
-			_vm->_dialogs->displayScrollChain('q', 81);
+			_vm->_dialogs->displayScrollChain('Q', 81);
 			break;
 		case 260 :
 			// Outside Geida's room.
-			_vm->_dialogs->displayScrollChain('q', 82);
+			_vm->_dialogs->displayScrollChain('Q', 82);
 			break;
 		}
 		break;
@@ -1289,7 +1289,7 @@ void Parser::openDoor() {
 		break;
 	case kRoomSpludwicks:
 		if (_thing == 61) {
-			_vm->_dialogs->displayScrollChain('q', 85);
+			_vm->_dialogs->displayScrollChain('Q', 85);
 			return;
 		}
 		break;
@@ -1307,7 +1307,7 @@ void Parser::openDoor() {
 			switch (portal->_operation) {
 			case kMagicExclaim:
 				_vm->_animation->_sprites[0]->bounce();
-				_vm->_dialogs->displayScrollChain('x', portal->_data);
+				_vm->_dialogs->displayScrollChain('X', portal->_data);
 				break;
 			case kMagicTransport:
 				_vm->flipRoom((Room)((portal->_data) >> 8), portal->_data & 0x0F);
@@ -1366,7 +1366,7 @@ void Parser::putProc() {
 					// Put onion into vinegar! Yes!
 					_vm->_onionInVinegar = true;
 					_vm->incScore(7);
-					_vm->_dialogs->displayScrollChain('u', 9);
+					_vm->_dialogs->displayScrollChain('U', 9);
 				}
 			}
 		} else
@@ -1457,10 +1457,10 @@ bool Parser::giveToSpludwick() {
 	case kObjectOnion:
 		_vm->_objects[kObjectOnion - 1] = false;
 		if (_vm->_rottenOnion)
-			_vm->_dialogs->displayScrollChain('q', 22);
+			_vm->_dialogs->displayScrollChain('Q', 22);
 		else {
 			_vm->_givenToSpludwick++;
-			_vm->_dialogs->displayScrollChain('q', 20);
+			_vm->_dialogs->displayScrollChain('Q', 20);
 			goToCauldron();
 			_vm->incScore(3);
 		}
@@ -1470,13 +1470,13 @@ bool Parser::giveToSpludwick() {
 		_vm->_objects[kObjectInk - 1] = false;
 		_vm->refreshObjectList();
 		_vm->_givenToSpludwick++;
-		_vm->_dialogs->displayScrollChain('q', 24);
+		_vm->_dialogs->displayScrollChain('Q', 24);
 		goToCauldron();
 		_vm->incScore(3);
 		break;
 	case kObjectMushroom:
 		_vm->_objects[kObjectMushroom - 1] = false;
-		_vm->_dialogs->displayScrollChain('q', 25);
+		_vm->_dialogs->displayScrollChain('Q', 25);
 		_vm->incScore(5);
 		_vm->_givenToSpludwick++;
 		goToCauldron();
@@ -1534,9 +1534,9 @@ void Parser::standUp() {
 		if (_vm->_avvyIsAwake && _vm->_avvyInBed) {
 			// But he's in bed.
 			if (_vm->_teetotal) {
-				_vm->_dialogs->displayScrollChain('d', 12);
+				_vm->_dialogs->displayScrollChain('D', 12);
 				_vm->_graphics->setBackgroundColor(kColorBlack);
-				_vm->_dialogs->displayScrollChain('d', 14);
+				_vm->_dialogs->displayScrollChain('D', 14);
 			}
 			_vm->_animation->_sprites[0]->_visible = true;
 			_vm->_userMovesAvvy = true;
@@ -1591,7 +1591,7 @@ void Parser::getProc(char thing) {
 				_vm->_dialogs->displayText(tmpStr);
 			}
 		} else
-			_vm->_dialogs->displayScrollChain('q', 57);
+			_vm->_dialogs->displayScrollChain('Q', 57);
 		break;
 	case kRoomInsideCardiffCastle:
 		switch (thing) {
@@ -1612,15 +1612,15 @@ void Parser::getProc(char thing) {
 					_vm->_dialogs->displayText("Taken.");
 				}
 			} else if (_vm->_standingOnDais)
-				_vm->_dialogs->displayScrollChain('q', 53);
+				_vm->_dialogs->displayScrollChain('Q', 53);
 			else
-				_vm->_dialogs->displayScrollChain('q', 51);
+				_vm->_dialogs->displayScrollChain('Q', 51);
 			break;
 		case kObjectBolt:
-			_vm->_dialogs->displayScrollChain('q', 52);
+			_vm->_dialogs->displayScrollChain('Q', 52);
 			break;
 		default:
-			_vm->_dialogs->displayScrollChain('q', 57);
+			_vm->_dialogs->displayScrollChain('Q', 57);
 		}
 		break;
 	case kRoomRobins:
@@ -1633,10 +1633,10 @@ void Parser::getProc(char thing) {
 			_vm->refreshObjectList();
 			_vm->incScore(3);
 		} else
-			_vm->_dialogs->displayScrollChain('q', 57);
+			_vm->_dialogs->displayScrollChain('Q', 57);
 		break;
 	default:
-		_vm->_dialogs->displayScrollChain('q', 57);
+		_vm->_dialogs->displayScrollChain('Q', 57);
 	}
 }
 
@@ -1653,7 +1653,7 @@ void Parser::giveGeidaTheLute() {
 	_vm->_objects[kObjectLute - 1] = false;
 	_vm->refreshObjectList();
 	// She plays it.
-	_vm->_dialogs->displayScrollChain('q', 64);
+	_vm->_dialogs->displayScrollChain('Q', 64);
 
 	_vm->_timer->addTimer(1, Timer::kProcGiveLuteToGeida, Timer::kReasonGeidaSings);
 	//_vm->_enid->backToBootstrap(4); TODO: Replace it with proper ScummVM-friendly function(s)!  Do not remove until then!
@@ -1667,7 +1667,7 @@ void Parser::playHarp() {
 }
 
 void Parser::winSequence() {
-	_vm->_dialogs->displayScrollChain('q', 78);
+	_vm->_dialogs->displayScrollChain('Q', 78);
 	_vm->_sequence->startWinSeq();
 	_vm->_timer->addTimer(30, Timer::kProcWinning, Timer::kReasonWinning);
 }
@@ -1805,7 +1805,7 @@ void Parser::doThat() {
 						break;
 					case kPeopleIbythneth:
 						if (_thing == kObjectBadge) {
-							_vm->_dialogs->displayScrollChain('q', 32); // Thanks! Wow!
+							_vm->_dialogs->displayScrollChain('Q', 32); // Thanks! Wow!
 							_vm->incScore(3);
 							_vm->_objects[kObjectBadge - 1] = false;
 							_vm->_objects[kObjectHabit - 1] = true;
@@ -1819,7 +1819,7 @@ void Parser::doThat() {
 						if (_vm->_aylesIsAwake) {
 							if (_thing == kObjectPen) {
 								_vm->_objects[kObjectPen - 1] = false;
-								_vm->_dialogs->displayScrollChain('q', 54);
+								_vm->_dialogs->displayScrollChain('Q', 54);
 								_vm->_objects[kObjectInk - 1] = true;
 								_vm->_givenPenToAyles = true;
 								_vm->refreshObjectList();
@@ -1834,7 +1834,7 @@ void Parser::doThat() {
 						case kObjectPotion:
 							_vm->_objects[kObjectPotion - 1] = false;
 							// She drinks it.
-							_vm->_dialogs->displayScrollChain('u', 16);
+							_vm->_dialogs->displayScrollChain('U', 16);
 							_vm->incScore(2);
 							_vm->_givenPotionToGeida = true;
 							_vm->refreshObjectList();
@@ -1853,7 +1853,7 @@ void Parser::doThat() {
 								winSequence();
 							else
 								// That Geida woman!
-								_vm->_dialogs->displayScrollChain('q', 77);
+								_vm->_dialogs->displayScrollChain('Q', 77);
 							break;
 						default:
 							_vm->_dialogs->sayThanks(_thing - 1);
@@ -2066,13 +2066,13 @@ void Parser::doThat() {
 		break;
 	case kVerbCodeMagic:
 		if (_vm->_avariciusTalk > 0)
-			_vm->_dialogs->displayScrollChain('q', 19);
+			_vm->_dialogs->displayScrollChain('Q', 19);
 		else {
 			if ((_vm->_room == kRoomSpludwicks) & (_vm->_animation->inField(1))) {
 				// Avaricius appears!
-				_vm->_dialogs->displayScrollChain('q', 17);
+				_vm->_dialogs->displayScrollChain('Q', 17);
 				if (_vm->getRoom(kPeopleSpludwick) == kRoomSpludwicks)
-					_vm->_dialogs->displayScrollChain('q', 18);
+					_vm->_dialogs->displayScrollChain('Q', 18);
 				else {
 					Avalanche::AnimationType *spr = _vm->_animation->_sprites[1];
 					// Avaricius
@@ -2226,7 +2226,7 @@ void Parser::doThat() {
 
 		case kRoomNottsPub:
 			// Can't sell to southerners.
-			_vm->_dialogs->displayScrollChain('n', 15);
+			_vm->_dialogs->displayScrollChain('N', 15);
 			break;
 		default:
 			// Can't buy that.
@@ -2363,7 +2363,7 @@ void Parser::doThat() {
 					// Picture of Avvy, awake in bed.
 					_vm->_background->draw(-1, -1, 2);
 					if (_vm->_teetotal)
-						_vm->_dialogs->displayScrollChain('d', 13);
+						_vm->_dialogs->displayScrollChain('D', 13);
 				} else
 					_vm->_dialogs->displayText("You're already awake, Avvy!");
 				break;