diff options
| author | uruk | 2013-09-08 11:20:37 +0200 | 
|---|---|---|
| committer | uruk | 2013-09-08 11:20:37 +0200 | 
| commit | 1b25defe3417d8ff526a37b5448fe96b415626a5 (patch) | |
| tree | f1b65156beaccc65e3cda6461fa90d726a84decc | |
| parent | b9c14ccb087801c6d40ee568e51921e62f8a1db2 (diff) | |
| download | scummvm-rg350-1b25defe3417d8ff526a37b5448fe96b415626a5.tar.gz scummvm-rg350-1b25defe3417d8ff526a37b5448fe96b415626a5.tar.bz2 scummvm-rg350-1b25defe3417d8ff526a37b5448fe96b415626a5.zip | |
AVALANCHE: Missing files from last commit...
| -rw-r--r-- | engines/avalanche/acci2.cpp | 172 | ||||
| -rw-r--r-- | engines/avalanche/animation.cpp | 16 | ||||
| -rw-r--r-- | engines/avalanche/avalot.cpp | 2 | ||||
| -rw-r--r-- | engines/avalanche/gyro2.cpp | 2 | ||||
| -rw-r--r-- | engines/avalanche/lucerna2.cpp | 4 | ||||
| -rw-r--r-- | engines/avalanche/scrolls2.cpp | 2 | ||||
| -rw-r--r-- | engines/avalanche/timeout2.cpp | 56 | 
7 files changed, 127 insertions, 127 deletions
| diff --git a/engines/avalanche/acci2.cpp b/engines/avalanche/acci2.cpp index 2b223b7fd6..3691ae9afc 100644 --- a/engines/avalanche/acci2.cpp +++ b/engines/avalanche/acci2.cpp @@ -406,7 +406,7 @@ void Acci::storeInterrogation(byte interrogation) {  		if (!_vm->_gyro->_dna._spareEvening.empty())  			_vm->_gyro->_dna._spareEvening.clear();  		_vm->_gyro->_dna._spareEvening = _vm->_parser->_inputText; -		_vm->_visa->dixi('z', 5); // His closing statement... +		_vm->_visa->displayScrollChain('z', 5); // His closing statement...  		_vm->_animation->tr[1].walkto(4); // The end of the drawbridge  		_vm->_animation->tr[1]._vanishIfStill = true; // Then go away!  		_vm->_gyro->_magics[1]._operation = _vm->_gyro->kMagicNothing; @@ -625,24 +625,24 @@ void Acci::examineObject() {  	case Gyro::kObjectWine :  		switch (_vm->_gyro->_dna._wineState) {// 4 is perfect wine. 0 is not holding the wine.  		case 1: -			_vm->_visa->dixi('t', 1); // Normal examine wine scroll +			_vm->_visa->displayScrollChain('t', 1); // Normal examine wine scroll  			break;  		case 2: -			_vm->_visa->dixi('d', 6); // Bad wine +			_vm->_visa->displayScrollChain('d', 6); // Bad wine  			break;  		case 3: -			_vm->_visa->dixi('d', 7); // Vinegar +			_vm->_visa->displayScrollChain('d', 7); // Vinegar  			break;  		}  		break;  	case Gyro::kObjectOnion:  		if (_vm->_gyro->_dna._rottenOnion) -			_vm->_visa->dixi('q', 21); // Yucky onion. +			_vm->_visa->displayScrollChain('q', 21); // Yucky onion.  		else -			_vm->_visa->dixi('t', 18);  // Normal onion scroll +			_vm->_visa->displayScrollChain('t', 18);  // Normal onion scroll  		break;  	default: -		_vm->_visa->dixi('t', _thing); // <<< Ordinarily +		_vm->_visa->displayScrollChain('t', _thing); // <<< Ordinarily  	}  } @@ -667,24 +667,24 @@ void Acci::exampers() {  		switch (_person) { // Special cases  		case 11:  			if (_vm->_gyro->_dna._wonNim) { -				_vm->_visa->dixi('Q', 8); // "I'm Not Playing!" +				_vm->_visa->displayScrollChain('Q', 8); // "I'm Not Playing!"  				return;  			}  			break;  		case 99:  			if (_vm->_gyro->_dna._lustieIsAsleep) { -				_vm->_visa->dixi('Q', 65); // He's asleep. (65! Wow!) +				_vm->_visa->displayScrollChain('Q', 65); // He's asleep. (65! Wow!)  				return;  			}  			break;  		}  		// Otherwise... -		_vm->_visa->dixi('p', _person); +		_vm->_visa->displayScrollChain('p', _person);  	}  	// And afterwards...  	if ((_person == 14) && (!_vm->_gyro->_dna._aylesIsAwake)) -		_vm->_visa->dixi('Q', 13); +		_vm->_visa->displayScrollChain('Q', 13);  }  bool Acci::holding() { @@ -770,43 +770,43 @@ void Acci::swallow() {   // Eat something.  		switch (_vm->_gyro->_dna._wineState) { // 4 is perfect  		case 1:  			if (_vm->_gyro->_dna._teetotal)  { -				_vm->_visa->dixi('D', 6); +				_vm->_visa->displayScrollChain('D', 6);  				return;  			} -			_vm->_visa->dixi('U', 1); +			_vm->_visa->displayScrollChain('U', 1);  			_vm->_pingo->wobble(); -			_vm->_visa->dixi('U', 2); +			_vm->_visa->displayScrollChain('U', 2);  			_vm->_gyro->_dna._objects[_vm->_gyro->kObjectWine - 1] = false;  			_vm->_lucerna->refreshObjectList();  			drink();  			break;  		case 2:  		case 3: -			_vm->_visa->dixi('d', 8); +			_vm->_visa->displayScrollChain('d', 8);  			break; // You can't drink it!  		}  		break;  	case Gyro::kObjectPotion:  		_vm->_gyro->setBackgroundColor(4); -		_vm->_visa->dixi('U', 3); +		_vm->_visa->displayScrollChain('U', 3);  		_vm->_lucerna->gameOver();  		_vm->_gyro->setBackgroundColor(0);  		break;  	case Gyro::kObjectInk: -		_vm->_visa->dixi('U', 4); +		_vm->_visa->displayScrollChain('U', 4);  		break;  	case Gyro::kObjectChastity: -		_vm->_visa->dixi('U', 5); +		_vm->_visa->displayScrollChain('U', 5);  		break;  	case Gyro::kObjectMushroom: -		_vm->_visa->dixi('U', 6); +		_vm->_visa->displayScrollChain('U', 6);  		_vm->_lucerna->gameOver();  		break;  	case Gyro::kObjectOnion:  		if (_vm->_gyro->_dna._rottenOnion) -			_vm->_visa->dixi('U', 11); +			_vm->_visa->displayScrollChain('U', 11);  		else { -			_vm->_visa->dixi('U', 8); +			_vm->_visa->displayScrollChain('U', 8);  			_vm->_gyro->_dna._objects[_vm->_gyro->kObjectOnion - 1] = false;  			_vm->_lucerna->refreshObjectList();  		} @@ -856,34 +856,34 @@ void Acci::lookAround() {  	switch (_vm->_gyro->_dna._room) {  	case r__spludwicks:  		if (_vm->_gyro->_dna._avariciusTalk > 0) -			_vm->_visa->dixi('q', 23); +			_vm->_visa->displayScrollChain('q', 23);  		else  			peopleInRoom();  		break;  	case r__robins:  		if (_vm->_gyro->_dna._tiedUp) -			_vm->_visa->dixi('q', 38); +			_vm->_visa->displayScrollChain('q', 38);  		if (_vm->_gyro->_dna._mushroomGrowing) -			_vm->_visa->dixi('q', 55); +			_vm->_visa->displayScrollChain('q', 55);  		break;  	case r__insidecardiffcastle:  		if (!_vm->_gyro->_dna._takenPen) -			_vm->_visa->dixi('q', 49); +			_vm->_visa->displayScrollChain('q', 49);  		break;  	case r__lustiesroom:  		if (_vm->_gyro->_dna._lustieIsAsleep) -			_vm->_visa->dixi('q', 65); +			_vm->_visa->displayScrollChain('q', 65);  		break;  	case r__catacombs:  		switch (_vm->_gyro->_dna._catacombY * 256 + _vm->_gyro->_dna._catacombX) {  		case 258 : -			_vm->_visa->dixi('q', 80); // Inside art gallery. +			_vm->_visa->displayScrollChain('q', 80); // Inside art gallery.  			break;  		case 514 : -			_vm->_visa->dixi('q', 81); // Outside ditto. +			_vm->_visa->displayScrollChain('q', 81); // Outside ditto.  			break;  		case 260 : -			_vm->_visa->dixi('q', 82); // Outside Geida's room. +			_vm->_visa->displayScrollChain('q', 82); // Outside Geida's room.  			break;  		}  		break; @@ -906,7 +906,7 @@ void Acci::openDoor() {  		break;  	case r__spludwicks:  		if (_thing == 61) { -			_vm->_visa->dixi('q', 85); +			_vm->_visa->displayScrollChain('q', 85);  			return;  		}  		break; @@ -922,7 +922,7 @@ void Acci::openDoor() {  			switch (_vm->_gyro->_portals[fv]._operation) {  			case Gyro::kMagicExclaim:  				_vm->_animation->tr[0].bounce(); -				_vm->_visa->dixi('x', _vm->_gyro->_portals[fv]._data); +				_vm->_visa->displayScrollChain('x', _vm->_gyro->_portals[fv]._data);  				break;  			case Gyro::kMagicTransport:  				_vm->_animation->fliproom((_vm->_gyro->_portals[fv]._data) >> 8,  // High byte @@ -982,7 +982,7 @@ void Acci::putProc() {  				else { // Put onion into vinegar! Yes!  					_vm->_gyro->_dna._onionInVinegar = true;  					_vm->_lucerna->incScore(7); -					_vm->_visa->dixi('u', 9); +					_vm->_visa->displayScrollChain('u', 9);  				}  			}  		} else @@ -1059,10 +1059,10 @@ bool Acci::giveToSpludwick() {  	case Gyro::kObjectOnion:  		_vm->_gyro->_dna._objects[_vm->_gyro->kObjectOnion - 1] = false;  		if (_vm->_gyro->_dna._rottenOnion) -			_vm->_visa->dixi('q', 22); +			_vm->_visa->displayScrollChain('q', 22);  		else {  			_vm->_gyro->_dna._givenToSpludwick++; -			_vm->_visa->dixi('q', 20); +			_vm->_visa->displayScrollChain('q', 20);  			goToCauldron();  			_vm->_lucerna->incScore(3);  		} @@ -1072,13 +1072,13 @@ bool Acci::giveToSpludwick() {  		_vm->_gyro->_dna._objects[_vm->_gyro->kObjectInk - 1] = false;  		_vm->_lucerna->refreshObjectList();  		_vm->_gyro->_dna._givenToSpludwick++; -		_vm->_visa->dixi('q', 24); +		_vm->_visa->displayScrollChain('q', 24);  		goToCauldron();  		_vm->_lucerna->incScore(3);  		break;  	case Gyro::kObjectMushroom:  		_vm->_gyro->_dna._objects[_vm->_gyro->kObjectMushroom - 1] = false; -		_vm->_visa->dixi('q', 25); +		_vm->_visa->displayScrollChain('q', 25);  		_vm->_lucerna->incScore(5);  		_vm->_gyro->_dna._givenToSpludwick++;  		goToCauldron(); @@ -1132,9 +1132,9 @@ void Acci::standUp() {  	case r__yours: // Avvy isn't asleep.  		if (_vm->_gyro->_dna._avvyIsAwake && _vm->_gyro->_dna._avvyInBed) {  // But he's in bed.  			if (_vm->_gyro->_dna._teetotal) { -				_vm->_visa->dixi('d', 12); +				_vm->_visa->displayScrollChain('d', 12);  				_vm->_gyro->setBackgroundColor(0); -				_vm->_visa->dixi('d', 14); +				_vm->_visa->displayScrollChain('d', 14);  			}  			_vm->_animation->tr[0]._visible = true;  			_vm->_gyro->_dna._userMovesAvvy = true; @@ -1183,7 +1183,7 @@ void Acci::getProc(char thing) {  			} else  				_vm->_scrolls->displayText(Common::String("I can't see ") + _vm->_gyro->getItem(thing) + " in the box.");  		} else -			_vm->_visa->dixi('q', 57); +			_vm->_visa->displayScrollChain('q', 57);  		break;  	case r__insidecardiffcastle:  		switch (thing) { @@ -1201,15 +1201,15 @@ void Acci::getProc(char thing) {  					_vm->_scrolls->displayText("Taken.");  				}  			} else if (_vm->_gyro->_dna._standingOnDais) -				_vm->_visa->dixi('q', 53); +				_vm->_visa->displayScrollChain('q', 53);  			else -				_vm->_visa->dixi('q', 51); +				_vm->_visa->displayScrollChain('q', 51);  			break;  		case Gyro::kObjectBolt: -			_vm->_visa->dixi('q', 52); +			_vm->_visa->displayScrollChain('q', 52);  			break;  		default: -			_vm->_visa->dixi('q', 57); +			_vm->_visa->displayScrollChain('q', 57);  		}  		break;  	case r__robins: @@ -1222,10 +1222,10 @@ void Acci::getProc(char thing) {  			_vm->_lucerna->refreshObjectList();  			_vm->_lucerna->incScore(3);  		} else -			_vm->_visa->dixi('q', 57); +			_vm->_visa->displayScrollChain('q', 57);  		break;  	default: -		_vm->_visa->dixi('q', 57); +		_vm->_visa->displayScrollChain('q', 57);  	}  } @@ -1240,7 +1240,7 @@ void Acci::giveGeidaTheLute() {  	}  	_vm->_gyro->_dna._objects[_vm->_gyro->kObjectLute - 1] = false;  	_vm->_lucerna->refreshObjectList(); -	_vm->_visa->dixi('q', 64); // She plays it. +	_vm->_visa->displayScrollChain('q', 64); // She plays it.  	_vm->_timeout->addTimer(1, _vm->_timeout->kProcGiveLuteToGeida, _vm->_timeout->kReasonGeidaSings);  	_vm->_enid->backToBootstrap(4); @@ -1254,7 +1254,7 @@ void Acci::playHarp() {  }  void Acci::winSequence() { -	_vm->_visa->dixi('q', 78); +	_vm->_visa->displayScrollChain('q', 78);  	_vm->_sequence->firstShow(7);  	_vm->_sequence->thenShow(8);  	_vm->_sequence->thenShow(9); @@ -1380,10 +1380,10 @@ void Acci::doThat() {  				if ((_person == 0) || (_person == kPardon))  					_vm->_scrolls->displayText("Talk to whom?");  				else if (isPersonHere()) -					_vm->_visa->talkto(_person); +					_vm->_visa->talkTo(_person);  			}  		} else if (isPersonHere()) -			_vm->_visa->talkto(_person); +			_vm->_visa->talkTo(_person);  		break;  	case kVerbCodeGive:  		if (holding()) { @@ -1421,7 +1421,7 @@ void Acci::doThat() {  						break;  					case Gyro::kPeopleIbythneth:  						if (_thing == _vm->_gyro->kObjectBadge) { -							_vm->_visa->dixi('q', 32); // Thanks! Wow! +							_vm->_visa->displayScrollChain('q', 32); // Thanks! Wow!  							_vm->_lucerna->incScore(3);  							_vm->_gyro->_dna._objects[_vm->_gyro->kObjectBadge - 1] = false;  							_vm->_gyro->_dna._objects[_vm->_gyro->kObjectHabit - 1] = true; @@ -1435,7 +1435,7 @@ void Acci::doThat() {  						if (_vm->_gyro->_dna._aylesIsAwake) {  							if (_thing == _vm->_gyro->kObjectPen) {  								_vm->_gyro->_dna._objects[_vm->_gyro->kObjectPen - 1] = false; -								_vm->_visa->dixi('q', 54); +								_vm->_visa->displayScrollChain('q', 54);  								_vm->_gyro->_dna._objects[_vm->_gyro->kObjectInk - 1] = true;  								_vm->_gyro->_dna._givenPenToAyles = true;  								_vm->_lucerna->refreshObjectList(); @@ -1449,7 +1449,7 @@ void Acci::doThat() {  						switch (_thing) {  						case Gyro::kObjectPotion:  							_vm->_gyro->_dna._objects[_vm->_gyro->kObjectPotion - 1] = false; -							_vm->_visa->dixi('u', 16); // She drinks it. +							_vm->_visa->displayScrollChain('u', 16); // She drinks it.  							_vm->_lucerna->incScore(2);  							_vm->_gyro->_dna._givenPotionToGeida = true;  							_vm->_lucerna->refreshObjectList(); @@ -1467,7 +1467,7 @@ void Acci::doThat() {  							if (_vm->_gyro->_dna._givenPotionToGeida)  								winSequence();  							else -								_vm->_visa->dixi('q', 77); // That Geida woman! +								_vm->_visa->displayScrollChain('q', 77); // That Geida woman!  							break;  						default:  							heyThanks(); @@ -1593,20 +1593,20 @@ void Acci::doThat() {  					// The player automatically wins the game everytime he wins, until I implement the mini-game.  					if (_vm->_gyro->_dna._wonNim) { // Already won the game. -						_vm->_visa->dixi('Q', 6); +						_vm->_visa->displayScrollChain('Q', 6);  						return;  					}  					if (!_vm->_gyro->_dna._askedDogfoodAboutNim) { -						_vm->_visa->dixi('q', 84); +						_vm->_visa->displayScrollChain('q', 84);  						return;  					} -					_vm->_visa->dixi('Q', 3); +					_vm->_visa->displayScrollChain('Q', 3);  					_vm->_gyro->_dna._playedNim++;  					// You won - strange! -					_vm->_visa->dixi('Q', 7); // You won! Give us a lute! +					_vm->_visa->displayScrollChain('Q', 7); // You won! Give us a lute!  					_vm->_gyro->_dna._objects[_vm->_gyro->kObjectLute - 1] = true;  					_vm->_lucerna->refreshObjectList();  					_vm->_gyro->_dna._wonNim = true; @@ -1628,13 +1628,13 @@ void Acci::doThat() {  		} else if (holding()) {  			switch (_thing) {  			case Gyro::kObjectLute : -					_vm->_visa->dixi('U', 7); +					_vm->_visa->displayScrollChain('U', 7);  					if (_vm->_gyro->_whereIs[_vm->_gyro->kPeopleCwytalot - 150] == _vm->_gyro->_dna._room) -						_vm->_visa->dixi('U', 10); +						_vm->_visa->displayScrollChain('U', 10);  					if (_vm->_gyro->_whereIs[_vm->_gyro->kPeopleDuLustie - 150] == _vm->_gyro->_dna._room) -						_vm->_visa->dixi('U', 15); +						_vm->_visa->displayScrollChain('U', 15);  				break;  			case 52:  				if (_vm->_gyro->_dna._room == r__musicroom) @@ -1693,12 +1693,12 @@ void Acci::doThat() {  		break;  	case kVerbCodeMagic:  		if (_vm->_gyro->_dna._avariciusTalk > 0) -			_vm->_visa->dixi('q', 19); +			_vm->_visa->displayScrollChain('q', 19);  		else {  			if ((_vm->_gyro->_dna._room == 12) & (_vm->_animation->infield(2))) { // Avaricius appears! -				_vm->_visa->dixi('q', 17); +				_vm->_visa->displayScrollChain('q', 17);  				if (_vm->_gyro->_whereIs[1] == 12) -					_vm->_visa->dixi('q', 18); +					_vm->_visa->displayScrollChain('q', 18);  				else {  					_vm->_animation->tr[1].init(1, false, _vm->_animation); // Avaricius  					_vm->_animation->apped(2, 4); @@ -1751,12 +1751,12 @@ void Acci::doThat() {  				case 54:  				case 58: // Beer, whisky, cider or mead.  					if (_vm->_gyro->_dna._malagauche == 177) { // Already getting us one. -						_vm->_visa->dixi('D', 15); +						_vm->_visa->displayScrollChain('D', 15);  						return;  					}  					if (_vm->_gyro->_dna._teetotal)  { -						_vm->_visa->dixi('D', 6); +						_vm->_visa->displayScrollChain('D', 6);  						return;  					} @@ -1776,10 +1776,10 @@ void Acci::doThat() {  					break; // We have a right one here - buy Pepsi??!  				case Gyro::kObjectWine:  					if (_vm->_gyro->_dna._objects[_vm->_gyro->kObjectWine - 1])  // We've already got the wine! -						_vm->_visa->dixi('D', 2); // 1 bottle's shufishent! +						_vm->_visa->displayScrollChain('D', 2); // 1 bottle's shufishent!  					else {  						if (_vm->_gyro->_dna._malagauche == 177) { // Already getting us one. -							_vm->_visa->dixi('D', 15); +							_vm->_visa->displayScrollChain('D', 15);  							return;  						} @@ -1800,21 +1800,21 @@ void Acci::doThat() {  					break;  				}  			} else -				_vm->_visa->dixi('D', 5); // Go to the bar! +				_vm->_visa->displayScrollChain('D', 5); // Go to the bar!  			break;  		case r__outsideducks:  			if (_vm->_animation->infield(6)) {  				if (_thing == _vm->_gyro->kObjectOnion) {  					if (_vm->_gyro->_dna._objects[_vm->_gyro->kObjectOnion - 1]) -						_vm->_visa->dixi('D', 10); // Not planning to juggle with the things! +						_vm->_visa->displayScrollChain('D', 10); // Not planning to juggle with the things!  					else if (_vm->_gyro->_dna._carryNum >= kCarryLimit)  						_vm->_scrolls->displayText("Before you ask, you remember that your hands are full.");  					else {  						if (_vm->_gyro->_dna._boughtOnion) -							_vm->_visa->dixi('D', 11); +							_vm->_visa->displayScrollChain('D', 11);  						else { -							_vm->_visa->dixi('D', 9); +							_vm->_visa->displayScrollChain('D', 9);  							_vm->_lucerna->incScore(3);  						}  						_vm->_gyro->decreaseMoney(3); // It costs thruppence. @@ -1825,16 +1825,16 @@ void Acci::doThat() {  						_vm->_gyro->_dna._onionInVinegar = false;  					}  				} else -					_vm->_visa->dixi('D', 0); +					_vm->_visa->displayScrollChain('D', 0);  			} else -				_vm->_visa->dixi('D', 0); +				_vm->_visa->displayScrollChain('D', 0);  			break;  		case r__nottspub: -			_vm->_visa->dixi('n', 15); // Can't sell to southerners. +			_vm->_visa->displayScrollChain('n', 15); // Can't sell to southerners.  			break;  		default: -			_vm->_visa->dixi('D', 0); // Can't buy that. +			_vm->_visa->displayScrollChain('D', 0); // Can't buy that.  		}  		break;  	case kVerbCodeAttack: @@ -1844,7 +1844,7 @@ void Acci::doThat() {  			switch (_vm->_gyro->_dna._objects[_vm->_gyro->kObjectBolt - 1] + _vm->_gyro->_dna._objects[_vm->_gyro->kObjectCrossbow - 1] * 2) {  				// 0 = neither, 1 = only bolt, 2 = only crossbow, 3 = both.  			case 0: -				_vm->_visa->dixi('Q', 10); +				_vm->_visa->displayScrollChain('Q', 10);  				_vm->_scrolls->displayText("(At the very least, don't use your bare hands!)");  				break;  			case 1: @@ -1854,7 +1854,7 @@ void Acci::doThat() {  				_vm->_scrolls->displayText("Come on, Avvy! You're not going to get very far with only a crossbow!");  				break;  			case 3: -				_vm->_visa->dixi('Q', 11); +				_vm->_visa->displayScrollChain('Q', 11);  				_vm->_gyro->_dna._cwytalotGone = true;  				_vm->_gyro->_dna._objects[_vm->_gyro->kObjectBolt - 1] = false;  				_vm->_gyro->_dna._objects[_vm->_gyro->kObjectCrossbow - 1] = false; @@ -1867,14 +1867,14 @@ void Acci::doThat() {  				_vm->_gyro->_whereIs[7] = 177;  				break;  			default: -				_vm->_visa->dixi('Q', 10); // Please try not to be so violent! +				_vm->_visa->displayScrollChain('Q', 10); // Please try not to be so violent!  			}  		} else -			_vm->_visa->dixi('Q', 10); +			_vm->_visa->displayScrollChain('Q', 10);  		break;  	case kVerbCodePasswd:  		if (_vm->_gyro->_dna._room != r__bridge) -			_vm->_visa->dixi('Q', 12); +			_vm->_visa->displayScrollChain('Q', 12);  		else {  			bool ok = true;  			for (byte i = 0; i < _thats.size(); i++) { @@ -1896,7 +1896,7 @@ void Acci::doThat() {  					_vm->_gyro->_dna._drawbridgeOpen = 1;  				}  			} else -				_vm->_visa->dixi('Q', 12); +				_vm->_visa->displayScrollChain('Q', 12);  		}  		break;  	case kVerbCodeDir: @@ -1922,16 +1922,16 @@ void Acci::doThat() {  		else if (isPersonHere()) {  			switch (_person) {  			case Gyro::kPeopleArkata: -				_vm->_visa->dixi('U', 12); +				_vm->_visa->displayScrollChain('U', 12);  				break;  			case Gyro::kPeopleGeida: -				_vm->_visa->dixi('U', 13); +				_vm->_visa->displayScrollChain('U', 13);  				break;  			case Gyro::kPeopleWisewoman: -				_vm->_visa->dixi('U', 14); +				_vm->_visa->displayScrollChain('U', 14);  				break;  			default: -				_vm->_visa->dixi('U', 5); // You WHAT? +				_vm->_visa->displayScrollChain('U', 5); // You WHAT?  			}  		} else if ((150 <= _person) && (_person <= 174))  			_vm->_scrolls->displayText("Hey, what kind of a weirdo are you??"); @@ -1963,7 +1963,7 @@ void Acci::doThat() {  					_vm->_gyro->_dna._avvyInBed = true;  					_vm->_celer->drawBackgroundSprite(-1, -1, 3); // Picture of Avvy, awake in bed.  					if (_vm->_gyro->_dna._teetotal) -						_vm->_visa->dixi('d', 13); +						_vm->_visa->displayScrollChain('d', 13);  				} else  					_vm->_scrolls->displayText("You're already awake, Avvy!");  				break; diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp index 68f59deef5..68266f366d 100644 --- a/engines/avalanche/animation.cpp +++ b/engines/avalanche/animation.cpp @@ -854,7 +854,7 @@ void Animation::call_special(uint16 which) {  		_vm->_gyro->_magics[11]._data = 5;  		_vm->_gyro->_magics[3]._operation = _vm->_gyro->kMagicBounce; // Now works as planned!  		stopWalking(); -		_vm->_visa->dixi('q', 26); +		_vm->_visa->displayScrollChain('q', 26);  		_vm->_gyro->_dna._userMovesAvvy = true;  		break;  	case 3: // _vm->_gyro->special 3: Room 71: triggers dart. @@ -884,11 +884,11 @@ void Animation::call_special(uint16 which) {  		if (_vm->_gyro->_dna._friarWillTieYouUp) {  			// _vm->_gyro->special 5: Room 42: touched tree, and get tied up.  			_vm->_gyro->_magics[4]._operation = _vm->_gyro->kMagicBounce; // Boundary effect is now working again. -			_vm->_visa->dixi('q', 35); +			_vm->_visa->displayScrollChain('q', 35);  			tr[0].done();  			//tr[1].vanishifstill:=true;  			_vm->_celer->drawBackgroundSprite(-1, -1, 2); -			_vm->_visa->dixi('q', 36); +			_vm->_visa->displayScrollChain('q', 36);  			_vm->_gyro->_dna._tiedUp = true;  			_vm->_gyro->_dna._friarWillTieYouUp = false;  			tr[1].walkto(3); @@ -917,7 +917,7 @@ void Animation::call_special(uint16 which) {  		break;  	case 8:        // _vm->_gyro->special 8: leave du Lustie's room.  		if ((_vm->_gyro->_dna._geidaFollows) && (!_vm->_gyro->_dna._lustieIsAsleep)) { -			_vm->_visa->dixi('q', 63); +			_vm->_visa->displayScrollChain('q', 63);  			tr[1].turn(kDirDown);  			tr[1].stopWalk();  			tr[1]._callEachStepFl = false; // Geida @@ -937,9 +937,9 @@ void Animation::call_special(uint16 which) {  		if ((_vm->_gyro->_dna._catacombX == 4) && (_vm->_gyro->_dna._catacombY == 1)) {  			// Into Geida's room.  			if (_vm->_gyro->_dna._objects[_vm->_gyro->kObjectKey - 1]) -				_vm->_visa->dixi('q', 62); +				_vm->_visa->displayScrollChain('q', 62);  			else { -				_vm->_visa->dixi('q', 61); +				_vm->_visa->displayScrollChain('q', 61);  				return;  			}  		} @@ -1201,7 +1201,7 @@ void Animation::arrow_procs(byte tripnum) {  			// OK, it's hit him... what now?  			tr[1]._callEachStepFl = false; // prevent recursion. -			_vm->_visa->dixi('Q', 47); // Complaint! +			_vm->_visa->displayScrollChain('Q', 47); // Complaint!  			tr[tripnum].done(); // Deallocate the arrow.  #if 0  			tr[1].done; { Deallocate normal pic of Avvy. } @@ -1409,7 +1409,7 @@ void Animation::animLink() {  	if (mustexclaim) {  		mustexclaim = false; -		_vm->_visa->dixi('x', saywhat); +		_vm->_visa->displayScrollChain('x', saywhat);  	}  } diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp index 052619c48f..e0e05144c4 100644 --- a/engines/avalanche/avalot.cpp +++ b/engines/avalanche/avalot.cpp @@ -182,7 +182,7 @@ void Avalot::setup() {  		_vm->_lucerna->fxToggle();  		_vm->_lucerna->thinkAbout(_vm->_gyro->kObjectMoney, Gyro::kThing); -		_vm->_visa->dixi('q', 83); // Info on the game, etc. +		_vm->_visa->displayScrollChain('q', 83); // Info on the game, etc.  	}  } diff --git a/engines/avalanche/gyro2.cpp b/engines/avalanche/gyro2.cpp index f7e917ed88..3f29ca4376 100644 --- a/engines/avalanche/gyro2.cpp +++ b/engines/avalanche/gyro2.cpp @@ -307,7 +307,7 @@ void Gyro::forceNumlock() {  bool Gyro::decreaseMoney(uint16 howmuchby) {  	_dna._money -= howmuchby;  	if (_dna._money < 0) { -		_vm->_visa->dixi('Q', 2); // "You are now denariusless!" +		_vm->_visa->displayScrollChain('Q', 2); // "You are now denariusless!"  		_vm->_lucerna->gameOver();  		return false;  	} else diff --git a/engines/avalanche/lucerna2.cpp b/engines/avalanche/lucerna2.cpp index 07fe6b4270..598ff63869 100644 --- a/engines/avalanche/lucerna2.cpp +++ b/engines/avalanche/lucerna2.cpp @@ -600,13 +600,13 @@ void Lucerna::enterRoom(byte room, byte ped) {  		{  			if ((_vm->_gyro->_dna._objects[_vm->_gyro->kObjectWine - 1]) && (_vm->_gyro->_dna._wineState != 3)) { -				_vm->_visa->dixi('q', 9); // Don't want to waste the wine! +				_vm->_visa->displayScrollChain('q', 9); // Don't want to waste the wine!  				_vm->_gyro->_dna._objects[_vm->_gyro->kObjectWine - 1] = false;  				refreshObjectList();  			}  		} -		_vm->_visa->dixi('q', 69); +		_vm->_visa->displayScrollChain('q', 69);  		break;  	case r__catacombs: diff --git a/engines/avalanche/scrolls2.cpp b/engines/avalanche/scrolls2.cpp index 6c05d7a946..01c61be208 100644 --- a/engines/avalanche/scrolls2.cpp +++ b/engines/avalanche/scrolls2.cpp @@ -718,7 +718,7 @@ void Scrolls::callScrollDriver() {  				case 10:  					switch (_vm->_gyro->_dna._boxContent) {  					case 0: { // Sixpence. -						_vm->_visa->dixi('q', 37); // You find the sixpence. +						_vm->_visa->displayScrollChain('q', 37); // You find the sixpence.  						_vm->_gyro->_dna._money += 6;  						_vm->_gyro->_dna._boxContent = _vm->_acci->kNothing;  						_vm->_lucerna->incScore(2); diff --git a/engines/avalanche/timeout2.cpp b/engines/avalanche/timeout2.cpp index fb73ce55c3..0f484fc5e8 100644 --- a/engines/avalanche/timeout2.cpp +++ b/engines/avalanche/timeout2.cpp @@ -243,7 +243,7 @@ void Timeout::openDrawbridge() {  }  void Timeout::avariciusTalks() { -	_vm->_visa->dixi('q', _vm->_gyro->_dna._avariciusTalk); +	_vm->_visa->displayScrollChain('q', _vm->_gyro->_dna._avariciusTalk);  	_vm->_gyro->_dna._avariciusTalk++;  	if (_vm->_gyro->_dna._avariciusTalk < 17) @@ -285,25 +285,25 @@ void Timeout::stairs() {  void Timeout::cardiffSurvey() {  	if (_vm->_gyro->_dna._cardiffQuestionNum == 0) {  		_vm->_gyro->_dna._cardiffQuestionNum++; -		_vm->_visa->dixi('q', 27); +		_vm->_visa->displayScrollChain('q', 27);  	} -	_vm->_visa->dixi('z', _vm->_gyro->_dna._cardiffQuestionNum); +	_vm->_visa->displayScrollChain('z', _vm->_gyro->_dna._cardiffQuestionNum);  	_vm->_gyro->_interrogation = _vm->_gyro->_dna._cardiffQuestionNum;  	addTimer(182, kProcCardiffSurvey, kReasonCardiffsurvey);  }  void Timeout::cardiffReturn() { -	_vm->_visa->dixi('q', 28); +	_vm->_visa->displayScrollChain('q', 28);  	cardiffSurvey(); // Add end of question.  }  void Timeout::cwytalotInHerts() { -	_vm->_visa->dixi('q', 29); +	_vm->_visa->displayScrollChain('q', 29);  }  void Timeout::getTiedUp() { -	_vm->_visa->dixi('q', 34); // ...Trouble! +	_vm->_visa->displayScrollChain('q', 34); // ...Trouble!  	_vm->_gyro->_dna._userMovesAvvy = false;  	_vm->_gyro->_dna._beenTiedUp = true;  	_vm->_animation->stopWalking(); @@ -326,17 +326,17 @@ void Timeout::hangAround() {  	_vm->_animation->tr[0].init(7, true, _vm->_animation); // Robin Hood  	_vm->_gyro->_whereIs[_vm->_gyro->kPeopleRobinHood - 150] = r__robins;  	_vm->_animation->apped(1, 2); -	_vm->_visa->dixi('q', 39); +	_vm->_visa->displayScrollChain('q', 39);  	_vm->_animation->tr[0].walkto(7);  	addTimer(55, kProcHangAround2, kReasonHangingAround);  }  void Timeout::hangAround2() { -	_vm->_visa->dixi('q', 40); +	_vm->_visa->displayScrollChain('q', 40);  	_vm->_animation->tr[1]._vanishIfStill = false;  	_vm->_animation->tr[1].walkto(4);  	_vm->_gyro->_whereIs[_vm->_gyro->kPeopleFriarTuck - 150] = r__robins; -	_vm->_visa->dixi('q', 41); +	_vm->_visa->displayScrollChain('q', 41);  	_vm->_animation->tr[0].done();  	_vm->_animation->tr[1].done(); // Get rid of Robin Hood and Friar Tuck. @@ -381,7 +381,7 @@ void Timeout::afterTheShootemup() {  	warning("STUB: Timeout::after_the_shootemup()"); -	_vm->_visa->dixi('q', 70); +	_vm->_visa->displayScrollChain('q', 70);  }  void Timeout::jacquesWakesUp() { @@ -390,7 +390,7 @@ void Timeout::jacquesWakesUp() {  	switch (_vm->_gyro->_dna._jacquesState) { // Additional pictures.  	case 1 :  		_vm->_celer->drawBackgroundSprite(-1, -1, 1); // Eyes open. -		_vm->_visa->dixi('Q', 45); +		_vm->_visa->displayScrollChain('Q', 45);  		break;  	case 2 : // Going through the door.  		_vm->_celer->drawBackgroundSprite(-1, -1, 2); // Not on the floor. @@ -436,7 +436,7 @@ void Timeout::naughtyDuke() { // This is when the Duke comes in and takes your m  }  void Timeout::naughtyDuke2() { -	_vm->_visa->dixi('q', 48); // "Ha ha, it worked again!" +	_vm->_visa->displayScrollChain('q', 48); // "Ha ha, it worked again!"  	_vm->_animation->tr[1].walkto(1); // Walk to the door.  	_vm->_animation->tr[1]._vanishIfStill = true; // Then go away!  	addTimer(32, kProcNaughtyDuke3, kReasonNaughtyDuke); @@ -489,14 +489,14 @@ void Timeout::jump() {  			_vm->_gyro->_dna._arrowInTheDoor = false; // You've got it.  			_vm->_gyro->_dna._objects[_vm->_gyro->kObjectBolt - 1] = true;  			_vm->_lucerna->refreshObjectList(); -			_vm->_visa->dixi('q', 50); +			_vm->_visa->displayScrollChain('q', 50);  			_vm->_lucerna->incScore(3);  		}  	}  }  void Timeout::crapulusSaysSpludOut() { -	_vm->_visa->dixi('q', 56); +	_vm->_visa->displayScrollChain('q', 56);  	_vm->_gyro->_dna._crapulusWillTell = false;  } @@ -504,11 +504,11 @@ void Timeout::buyDrinks() {  	_vm->_celer->drawBackgroundSprite(-1, -1, 11); // Malagauche gets up again.  	_vm->_gyro->_dna._malagauche = 0; -	_vm->_visa->dixi('D', _vm->_gyro->_dna._drinking); // Display message about it. +	_vm->_visa->displayScrollChain('D', _vm->_gyro->_dna._drinking); // Display message about it.  	_vm->_pingo->wobble(); // Do the special effects. -	_vm->_visa->dixi('D', 1); // That'll be thruppence. +	_vm->_visa->displayScrollChain('D', 1); // That'll be thruppence.  	if (_vm->_gyro->decreaseMoney(3)) // Pay 3d. -		_vm->_visa->dixi('D', 3); // Tell 'em you paid up. +		_vm->_visa->displayScrollChain('D', 3); // Tell 'em you paid up.  	_vm->_acci->drink();  } @@ -516,10 +516,10 @@ void Timeout::buyWine() {  	_vm->_celer->drawBackgroundSprite(-1, -1, 11); // Malagauche gets up again.  	_vm->_gyro->_dna._malagauche = 0; -	_vm->_visa->dixi('D', 50); // You buy the wine. -	_vm->_visa->dixi('D', 1); // It'll be thruppence. +	_vm->_visa->displayScrollChain('D', 50); // You buy the wine. +	_vm->_visa->displayScrollChain('D', 1); // It'll be thruppence.  	if (_vm->_gyro->decreaseMoney(3)) { -		_vm->_visa->dixi('D', 4); // You paid up. +		_vm->_visa->displayScrollChain('D', 4); // You paid up.  		_vm->_gyro->_dna._objects[_vm->_gyro->kObjectWine - 1] = true;  		_vm->_lucerna->refreshObjectList();  		_vm->_gyro->_dna._wineState = 1; // OK Wine. @@ -527,12 +527,12 @@ void Timeout::buyWine() {  }  void Timeout::callsGuards() { -	_vm->_visa->dixi('Q', 58); // "GUARDS!!!" +	_vm->_visa->displayScrollChain('Q', 58); // "GUARDS!!!"  	_vm->_lucerna->gameOver();  }  void Timeout::greetsMonk() { -	_vm->_visa->dixi('Q', 59); +	_vm->_visa->displayScrollChain('Q', 59);  	_vm->_gyro->_dna._enteredLustiesRoomAsMonk = true;  } @@ -549,7 +549,7 @@ void Timeout::meetAvaroid() {  			+ _vm->_scrolls->kControlRoman + " lucky twice in a row!");  		_vm->_lucerna->gameOver();  	} else { -		_vm->_visa->dixi('Q', 60); +		_vm->_visa->displayScrollChain('Q', 60);  		_vm->_gyro->_dna._metAvaroid = true;  		addTimer(1, kProcRiseUpOubliette, kReasonRisingUpOubliette); @@ -583,7 +583,7 @@ void Timeout::robinHoodAndGeida() {  }  void Timeout::robinHoodAndGeidaTalk() { -	_vm->_visa->dixi('q', 66); +	_vm->_visa->displayScrollChain('q', 66);  	_vm->_animation->tr[0].walkto(2);  	_vm->_animation->tr[1].walkto(2);  	_vm->_animation->tr[0]._vanishIfStill = true; @@ -596,7 +596,7 @@ void Timeout::avalotReturns() {  	_vm->_animation->tr[1].done();  	_vm->_animation->tr[0].init(0, true, _vm->_animation);  	_vm->_animation->apped(1, 1); -	_vm->_visa->dixi('q', 67); +	_vm->_visa->displayScrollChain('q', 67);  	_vm->_gyro->_dna._userMovesAvvy = true;  } @@ -625,12 +625,12 @@ void Timeout::arkataShouts() {  	if (_vm->_gyro->_dna._teetotal)  		return; -	_vm->_visa->dixi('q', 76); +	_vm->_visa->displayScrollChain('q', 76);  	addTimer(160, kProcArkataShouts, kReasonArkataShouts);  }  void Timeout::winning() { -	_vm->_visa->dixi('q', 79); +	_vm->_visa->displayScrollChain('q', 79);  	_vm->_pingo->winningPic();  	warning("STUB: Timeout::winning()"); @@ -673,7 +673,7 @@ void Timeout::spludwickLeavesCauldron() {  }  void Timeout::giveLuteToGeida() { // Moved here from Acci. -	_vm->_visa->dixi('Q', 86); +	_vm->_visa->displayScrollChain('Q', 86);  	_vm->_lucerna->incScore(4);  	_vm->_gyro->_dna._lustieIsAsleep = true;  	_vm->_sequence->firstShow(5); | 
