thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Strangerke 2013-11-23 10:42:15 +01:00
parent 4fe5c64c3f
commit 1a7bcd72cf
6 changed files with 87 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

14
engines/avalanche/animation.cpp
View file

@ -792,7 +792,7 @@ void Animation::callSpecial(uint16 which) {
_vm->_magics[11]._data = 5; _vm->_magics[11]._data = 5;
_vm->_magics[3]._operation = kMagicBounce; // Now works as planned! _vm->_magics[3]._operation = kMagicBounce; // Now works as planned!
stopWalking(); stopWalking();
_vm->_dialogs->displayScrollChain('q', 26); _vm->_dialogs->displayScrollChain('Q', 26);
_vm->_userMovesAvvy = true; _vm->_userMovesAvvy = true;
break; break;
case 3: // _vm->special 3: Room 71: triggers dart. case 3: // _vm->special 3: Room 71: triggers dart.
@ -824,12 +824,12 @@ void Animation::callSpecial(uint16 which) {
if (_vm->_friarWillTieYouUp) { if (_vm->_friarWillTieYouUp) {
// _vm->special 5: Room 42: touched tree, and get tied up. // _vm->special 5: Room 42: touched tree, and get tied up.
_vm->_magics[4]._operation = kMagicBounce; // Boundary effect is now working again. _vm->_magics[4]._operation = kMagicBounce; // Boundary effect is now working again.
_vm->_dialogs->displayScrollChain('q', 35); _vm->_dialogs->displayScrollChain('Q', 35);
_sprites[0]->remove(); _sprites[0]->remove();
AnimationType *spr1 = _sprites[1]; AnimationType *spr1 = _sprites[1];
_vm->_background->draw(-1, -1, 1); _vm->_background->draw(-1, -1, 1);
_vm->_dialogs->displayScrollChain('q', 36); _vm->_dialogs->displayScrollChain('Q', 36);
_vm->_tiedUp = true; _vm->_tiedUp = true;
_vm->_friarWillTieYouUp = false; _vm->_friarWillTieYouUp = false;
spr1->walkTo(2); spr1->walkTo(2);
@ -862,7 +862,7 @@ void Animation::callSpecial(uint16 which) {
case 8: // _vm->special 8: leave du Lustie's room. case 8: // _vm->special 8: leave du Lustie's room.
if (_vm->_geidaFollows && !_vm->_lustieIsAsleep) { if (_vm->_geidaFollows && !_vm->_lustieIsAsleep) {
AnimationType *spr1 = _sprites[1]; AnimationType *spr1 = _sprites[1];
_vm->_dialogs->displayScrollChain('q', 63); _vm->_dialogs->displayScrollChain('Q', 63);
spr1->turn(kDirDown); spr1->turn(kDirDown);
spr1->stopWalk(); spr1->stopWalk();
spr1->_callEachStepFl = false; // Geida spr1->_callEachStepFl = false; // Geida
@ -885,9 +885,9 @@ void Animation::callSpecial(uint16 which) {
if ((_vm->_catacombX == 4) && (_vm->_catacombY == 1)) { if ((_vm->_catacombX == 4) && (_vm->_catacombY == 1)) {
// Into Geida's room. // Into Geida's room.
if (_vm->_objects[kObjectKey - 1]) if (_vm->_objects[kObjectKey - 1])
_vm->_dialogs->displayScrollChain('q', 62); _vm->_dialogs->displayScrollChain('Q', 62);
else { else {
_vm->_dialogs->displayScrollChain('q', 61); _vm->_dialogs->displayScrollChain('Q', 61);
return; return;
} }
} }
@ -1247,7 +1247,7 @@ void Animation::animLink() {
if (_mustExclaim) { if (_mustExclaim) {
_mustExclaim = false; _mustExclaim = false;
_vm->_dialogs->displayScrollChain('x', _sayWhat); _vm->_dialogs->displayScrollChain('X', _sayWhat);
} }
} }

6
engines/avalanche/avalot.cpp
View file

@ -300,7 +300,7 @@ void AvalancheEngine::setup() {
fxToggle(); fxToggle();
thinkAbout(kObjectMoney, kThing); thinkAbout(kObjectMoney, kThing);
_dialogs->displayScrollChain('q', 83); // Info on the game, etc. _dialogs->displayScrollChain('Q', 83); // Info on the game, etc.
} }
} }
@ -809,12 +809,12 @@ void AvalancheEngine::enterRoom(Room roomId, byte ped) {
_graphics->zoomOut(_peds[ped - 1]._x, _peds[ped - 1]._y); _graphics->zoomOut(_peds[ped - 1]._x, _peds[ped - 1]._y);
if ((_objects[kObjectWine - 1]) && (_wineState != 3)) { if ((_objects[kObjectWine - 1]) && (_wineState != 3)) {
_dialogs->displayScrollChain('q', 9); // Don't want to waste the wine! _dialogs->displayScrollChain('Q', 9); // Don't want to waste the wine!
_objects[kObjectWine - 1] = false; _objects[kObjectWine - 1] = false;
refreshObjectList(); refreshObjectList();
} }
_dialogs->displayScrollChain('q', 69); _dialogs->displayScrollChain('Q', 69);
break; break;
case kRoomCatacombs: case kRoomCatacombs:

32
engines/avalanche/dialogs.cpp
View file

@ -762,7 +762,7 @@ void Dialogs::displayText(Common::String text) {
case 10: case 10:
switch (_vm->_boxContent) { switch (_vm->_boxContent) {
case 0: // Sixpence. case 0: // Sixpence.
displayScrollChain('q', 37); // You find the sixpence. displayScrollChain('Q', 37); // You find the sixpence.
_vm->_money += 6; _vm->_money += 6;
_vm->_boxContent = _vm->_parser->kNothing; _vm->_boxContent = _vm->_parser->kNothing;
_vm->incScore(2); _vm->incScore(2);
@ -905,7 +905,7 @@ void Dialogs::displayScrollChain(char block, byte point, bool report, bool bubbl
bool error = false; bool error = false;
indexfile.seek((toupper(block) - 65) * 2); indexfile.seek((toupper(block) - 'A') * 2);
uint16 idx_offset = indexfile.readUint16LE(); uint16 idx_offset = indexfile.readUint16LE();
if (idx_offset == 0) if (idx_offset == 0)
error = true; error = true;
@ -1006,7 +1006,7 @@ void Dialogs::talkTo(byte whom) {
switch (whom) { switch (whom) {
case kPeopleSpludwick: case kPeopleSpludwick:
if ((_vm->_lustieIsAsleep) & (!_vm->_objects[kObjectPotion - 1])) { if ((_vm->_lustieIsAsleep) & (!_vm->_objects[kObjectPotion - 1])) {
displayScrollChain('q', 68); displayScrollChain('Q', 68);
_vm->_objects[kObjectPotion - 1] = true; _vm->_objects[kObjectPotion - 1] = true;
_vm->refreshObjectList(); _vm->refreshObjectList();
_vm->incScore(3); _vm->incScore(3);
@ -1024,58 +1024,58 @@ void Dialogs::talkTo(byte whom) {
} }
return; return;
case 3: case 3:
displayScrollChain('q', 30); // Need any help with the game? displayScrollChain('Q', 30); // Need any help with the game?
return; return;
} }
} else { } else {
displayScrollChain('q', 42); // Haven't talked to Crapulus. Go and talk to him. displayScrollChain('Q', 42); // Haven't talked to Crapulus. Go and talk to him.
return; return;
} }
break; break;
case kPeopleIbythneth: case kPeopleIbythneth:
if (_vm->_givenBadgeToIby) { if (_vm->_givenBadgeToIby) {
displayScrollChain('q', 33); // Thanks a lot! displayScrollChain('Q', 33); // Thanks a lot!
return; // And leave the proc. return; // And leave the proc.
} }
break; // Or... just continue, 'cos he hasn't got it. break; // Or... just continue, 'cos he hasn't got it.
case kPeopleDogfood: case kPeopleDogfood:
if (_vm->_wonNim) { // We've won the game. if (_vm->_wonNim) { // We've won the game.
displayScrollChain('q', 6); // "I'm Not Playing!" displayScrollChain('Q', 6); // "I'm Not Playing!"
return; // Zap back. return; // Zap back.
} else } else
_vm->_askedDogfoodAboutNim = true; _vm->_askedDogfoodAboutNim = true;
break; break;
case kPeopleAyles: case kPeopleAyles:
if (!_vm->_aylesIsAwake) { if (!_vm->_aylesIsAwake) {
displayScrollChain('q', 43); // He's fast asleep! displayScrollChain('Q', 43); // He's fast asleep!
return; return;
} else if (!_vm->_givenPenToAyles) { } else if (!_vm->_givenPenToAyles) {
displayScrollChain('q', 44); // Can you get me a pen, Avvy? displayScrollChain('Q', 44); // Can you get me a pen, Avvy?
return; return;
} }
break; break;
case kPeopleJacques: case kPeopleJacques:
displayScrollChain('q', 43); displayScrollChain('Q', 43);
return; return;
case kPeopleGeida: case kPeopleGeida:
if (_vm->_givenPotionToGeida) if (_vm->_givenPotionToGeida)
_vm->_geidaFollows = true; _vm->_geidaFollows = true;
else { else {
displayScrollChain('u', 17); displayScrollChain('U', 17);
return; return;
} }
break; break;
case kPeopleSpurge: case kPeopleSpurge:
if (!_vm->_sittingInPub) { if (!_vm->_sittingInPub) {
displayScrollChain('q', 71); // Try going over and sitting down. displayScrollChain('Q', 71); // Try going over and sitting down.
return; return;
} else { } else {
if (_vm->_spurgeTalkCount < 5) if (_vm->_spurgeTalkCount < 5)
_vm->_spurgeTalkCount++; _vm->_spurgeTalkCount++;
if (_vm->_spurgeTalkCount > 1) { // no. 1 falls through if (_vm->_spurgeTalkCount > 1) { // no. 1 falls through
displayScrollChain('q', 70 + _vm->_spurgeTalkCount); displayScrollChain('Q', 70 + _vm->_spurgeTalkCount);
return; return;
} }
} }
@ -1083,7 +1083,7 @@ void Dialogs::talkTo(byte whom) {
} }
// On a subject. Is there any reason to block it? // On a subject. Is there any reason to block it?
} else if ((whom == kPeopleAyles) && (!_vm->_aylesIsAwake)) { } else if ((whom == kPeopleAyles) && (!_vm->_aylesIsAwake)) {
displayScrollChain('q', 43); // He's fast asleep! displayScrollChain('Q', 43); // He's fast asleep!
return; return;
} }
@ -1108,12 +1108,12 @@ void Dialogs::talkTo(byte whom) {
speak(whom, _vm->_subjectNum); speak(whom, _vm->_subjectNum);
if (!_noError) if (!_noError)
displayScrollChain('n', whom); // File not found! displayScrollChain('N', whom); // File not found!
if ((_vm->_subjectNum == 0) && ((whom + 149) == kPeopleCrapulus)) { // Crapulus: get the badge - first time only if ((_vm->_subjectNum == 0) && ((whom + 149) == kPeopleCrapulus)) { // Crapulus: get the badge - first time only
_vm->_objects[kObjectBadge - 1] = true; _vm->_objects[kObjectBadge - 1] = true;
_vm->refreshObjectList(); _vm->refreshObjectList();
displayScrollChain('q', 1); // Circular from Cardiff. displayScrollChain('Q', 1); // Circular from Cardiff.
_vm->_talkedToCrapulus = true; _vm->_talkedToCrapulus = true;
_vm->setRoom(kPeopleCrapulus, kRoomDummy); // Crapulus walks off. _vm->setRoom(kPeopleCrapulus, kRoomDummy); // Crapulus walks off.

2
engines/avalanche/nim.cpp
View file

@ -56,7 +56,7 @@ void Nim::playNim() {
} }
if (!_vm->_askedDogfoodAboutNim) { if (!_vm->_askedDogfoodAboutNim) {
_vm->_dialogs->displayScrollChain('q', 84); _vm->_dialogs->displayScrollChain('Q', 84);
return; return;
} }

86
engines/avalanche/parser.cpp
View file

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

34
engines/avalanche/timer.cpp
View file

@ -224,7 +224,7 @@ void Timer::openDrawbridge() {
} }
void Timer::avariciusTalks() { void Timer::avariciusTalks() {
_vm->_dialogs->displayScrollChain('q', _vm->_avariciusTalk); _vm->_dialogs->displayScrollChain('Q', _vm->_avariciusTalk);
_vm->_avariciusTalk++; _vm->_avariciusTalk++;
if (_vm->_avariciusTalk < 17) if (_vm->_avariciusTalk < 17)
@ -267,25 +267,25 @@ void Timer::stairs() {
void Timer::cardiffSurvey() { void Timer::cardiffSurvey() {
if (_vm->_cardiffQuestionNum == 0) { if (_vm->_cardiffQuestionNum == 0) {
_vm->_cardiffQuestionNum++; _vm->_cardiffQuestionNum++;
_vm->_dialogs->displayScrollChain('q', 27); _vm->_dialogs->displayScrollChain('Q', 27);
} }
_vm->_dialogs->displayScrollChain('z', _vm->_cardiffQuestionNum); _vm->_dialogs->displayScrollChain('Z', _vm->_cardiffQuestionNum);
_vm->_interrogation = _vm->_cardiffQuestionNum; _vm->_interrogation = _vm->_cardiffQuestionNum;
addTimer(182, kProcCardiffSurvey, kReasonCardiffsurvey); addTimer(182, kProcCardiffSurvey, kReasonCardiffsurvey);
} }
void Timer::cardiffReturn() { void Timer::cardiffReturn() {
_vm->_dialogs->displayScrollChain('q', 28); _vm->_dialogs->displayScrollChain('Q', 28);
cardiffSurvey(); // Add end of question. cardiffSurvey(); // Add end of question.
} }
void Timer::cwytalotInHerts() { void Timer::cwytalotInHerts() {
_vm->_dialogs->displayScrollChain('q', 29); _vm->_dialogs->displayScrollChain('Q', 29);
} }
void Timer::getTiedUp() { void Timer::getTiedUp() {
_vm->_dialogs->displayScrollChain('q', 34); // ...Trouble! _vm->_dialogs->displayScrollChain('Q', 34); // ...Trouble!
_vm->_userMovesAvvy = false; _vm->_userMovesAvvy = false;
_vm->_beenTiedUp = true; _vm->_beenTiedUp = true;
_vm->_animation->stopWalking(); _vm->_animation->stopWalking();
@ -312,18 +312,18 @@ void Timer::hangAround() {
avvy->init(7, true); // Robin Hood avvy->init(7, true); // Robin Hood
_vm->setRoom(kPeopleRobinHood, kRoomRobins); _vm->setRoom(kPeopleRobinHood, kRoomRobins);
_vm->_animation->appearPed(0, 1); _vm->_animation->appearPed(0, 1);
_vm->_dialogs->displayScrollChain('q', 39); _vm->_dialogs->displayScrollChain('Q', 39);
avvy->walkTo(6); avvy->walkTo(6);
addTimer(55, kProcHangAround2, kReasonHangingAround); addTimer(55, kProcHangAround2, kReasonHangingAround);
} }
void Timer::hangAround2() { void Timer::hangAround2() {
_vm->_dialogs->displayScrollChain('q', 40); _vm->_dialogs->displayScrollChain('Q', 40);
AnimationType *spr = _vm->_animation->_sprites[1]; AnimationType *spr = _vm->_animation->_sprites[1];
spr->_vanishIfStill = false; spr->_vanishIfStill = false;
spr->walkTo(3); spr->walkTo(3);
_vm->setRoom(kPeopleFriarTuck, kRoomRobins); _vm->setRoom(kPeopleFriarTuck, kRoomRobins);
_vm->_dialogs->displayScrollChain('q', 41); _vm->_dialogs->displayScrollChain('Q', 41);
_vm->_animation->_sprites[0]->remove(); _vm->_animation->_sprites[0]->remove();
spr->remove(); // Get rid of Robin Hood and Friar Tuck. spr->remove(); // Get rid of Robin Hood and Friar Tuck.
@ -367,7 +367,7 @@ void Timer::afterTheShootemup() {
warning("STUB: Timer::after_the_shootemup()"); warning("STUB: Timer::after_the_shootemup()");
_vm->_dialogs->displayScrollChain('q', 70); _vm->_dialogs->displayScrollChain('Q', 70);
} }
void Timer::jacquesWakesUp() { void Timer::jacquesWakesUp() {
@ -423,7 +423,7 @@ void Timer::naughtyDuke() { // This is when the Duke comes in and takes your mon
void Timer::naughtyDuke2() { void Timer::naughtyDuke2() {
AnimationType *spr = _vm->_animation->_sprites[1]; AnimationType *spr = _vm->_animation->_sprites[1];
_vm->_dialogs->displayScrollChain('q', 48); // "Ha ha, it worked again!" _vm->_dialogs->displayScrollChain('Q', 48); // "Ha ha, it worked again!"
spr->walkTo(0); // Walk to the door. spr->walkTo(0); // Walk to the door.
spr->_vanishIfStill = true; // Then go away! spr->_vanishIfStill = true; // Then go away!
@ -476,14 +476,14 @@ void Timer::jump() {
_vm->_arrowInTheDoor = false; // You've got it. _vm->_arrowInTheDoor = false; // You've got it.
_vm->_objects[kObjectBolt - 1] = true; _vm->_objects[kObjectBolt - 1] = true;
_vm->refreshObjectList(); _vm->refreshObjectList();
_vm->_dialogs->displayScrollChain('q', 50); _vm->_dialogs->displayScrollChain('Q', 50);
_vm->incScore(3); _vm->incScore(3);
} }
} }
} }
void Timer::crapulusSaysSpludOut() { void Timer::crapulusSaysSpludOut() {
_vm->_dialogs->displayScrollChain('q', 56); _vm->_dialogs->displayScrollChain('Q', 56);
_vm->_crapulusWillTell = false; _vm->_crapulusWillTell = false;
} }
@ -578,7 +578,7 @@ void Timer::robinHoodAndGeida() {
} }
void Timer::robinHoodAndGeidaTalk() { void Timer::robinHoodAndGeidaTalk() {
_vm->_dialogs->displayScrollChain('q', 66); _vm->_dialogs->displayScrollChain('Q', 66);
AnimationType *avvy = _vm->_animation->_sprites[0]; AnimationType *avvy = _vm->_animation->_sprites[0];
AnimationType *spr = _vm->_animation->_sprites[1]; AnimationType *spr = _vm->_animation->_sprites[1];
@ -597,7 +597,7 @@ void Timer::avalotReturns() {
spr->remove(); spr->remove();
avvy->init(0, true); avvy->init(0, true);
_vm->_animation->appearPed(0, 0); _vm->_animation->appearPed(0, 0);
_vm->_dialogs->displayScrollChain('q', 67); _vm->_dialogs->displayScrollChain('Q', 67);
_vm->_userMovesAvvy = true; _vm->_userMovesAvvy = true;
} }
@ -628,12 +628,12 @@ void Timer::arkataShouts() {
if (_vm->_teetotal) if (_vm->_teetotal)
return; return;
_vm->_dialogs->displayScrollChain('q', 76); _vm->_dialogs->displayScrollChain('Q', 76);
addTimer(160, kProcArkataShouts, kReasonArkataShouts); addTimer(160, kProcArkataShouts, kReasonArkataShouts);
} }
void Timer::winning() { void Timer::winning() {
_vm->_dialogs->displayScrollChain('q', 79); _vm->_dialogs->displayScrollChain('Q', 79);
_vm->_pingo->winningPic(); _vm->_pingo->winningPic();
warning("STUB: Timer::winning()"); warning("STUB: Timer::winning()");