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

AVALANCHE: Rename Celer to Background.

Browse source
This commit is contained in:
uruk 2013-09-19 20:53:47 +02:00
parent 0356040910
commit 21a9de5df2
11 changed files with 138 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

38
engines/avalanche/acci.cpp
View file

@ -35,7 +35,7 @@
#include "avalanche/scrolls.h"
#include "avalanche/timer.h"
#include "avalanche/animation.h"
#include "avalanche/celer.h"
#include "avalanche/background.h"
#include "avalanche/pingo.h"
#include "avalanche/sequence.h"
@ -871,17 +871,17 @@ bool Acci::isHolding() {
void Acci::openBox(bool isOpening) {
if ((_vm->_gyro->_room == kRoomYours) && (_thing == 54)) {
_vm->_celer->drawBackgroundSprite(-1, -1, 4);
_vm->_background->drawBackgroundSprite(-1, -1, 4);
_vm->_celer->updateBackgroundSprites();
_vm->_background->updateBackgroundSprites();
_vm->_animation->animLink();
_vm->_graphics->refreshScreen();
_vm->_system->delayMillis(55);
if (!isOpening) {
_vm->_celer->drawBackgroundSprite(-1, -1, 5);
_vm->_celer->updateBackgroundSprites();
_vm->_background->drawBackgroundSprite(-1, -1, 5);
_vm->_background->updateBackgroundSprites();
_vm->_animation->animLink();
_vm->_graphics->refreshScreen();
}
@ -1315,7 +1315,7 @@ void Acci::standUp() {
_vm->_gyro->_userMovesAvvy = true;
_vm->_animation->appearPed(0, 1);
_vm->_animation->_direction = Animation::kDirLeft;
_vm->_celer->drawBackgroundSprite(-1, -1, 3); // Picture of empty pillow.
_vm->_background->drawBackgroundSprite(-1, -1, 3); // Picture of empty pillow.
_vm->_lucerna->incScore(1);
_vm->_gyro->_avvyInBed = false;
_vm->_timer->loseTimer(Timer::kReasonArkataShouts);
@ -1329,7 +1329,7 @@ void Acci::standUp() {
case kRoomNottsPub:
if (_vm->_gyro->_sittingInPub) {
_vm->_celer->drawBackgroundSprite(-1, -1, 3); // Not sitting down.
_vm->_background->drawBackgroundSprite(-1, -1, 3); // Not sitting down.
_vm->_animation->_sprites[0]._visible = true; // But standing up.
_vm->_animation->appearPed(0, 3); // And walking away.
_vm->_gyro->_sittingInPub = false; // Really not sitting down.
@ -1347,12 +1347,12 @@ void Acci::getProc(char thing) {
case kRoomYours:
if (_vm->_animation->inField(1)) {
if (_vm->_gyro->_boxContent == thing) {
_vm->_celer->drawBackgroundSprite(-1, -1, 4);
_vm->_background->drawBackgroundSprite(-1, -1, 4);
_vm->_scrolls->displayText("OK, I've got it.");
_vm->_gyro->_objects[thing - 1] = true;
_vm->_lucerna->refreshObjectList();
_vm->_gyro->_boxContent = kNothing;
_vm->_celer->drawBackgroundSprite(-1, -1, 5);
_vm->_background->drawBackgroundSprite(-1, -1, 5);
} else {
Common::String tmpStr = Common::String::format("I can't see %s in the box.", _vm->_gyro->getItem(thing).c_str());
_vm->_scrolls->displayText(tmpStr);
@ -1368,7 +1368,7 @@ void Acci::getProc(char thing) {
_vm->_scrolls->displayText("It's not there, Avvy.");
else {
// OK: we're taking the pen, and it's there.
_vm->_celer->drawBackgroundSprite(-1, -1, 3); // No pen there now.
_vm->_background->drawBackgroundSprite(-1, -1, 3); // No pen there now.
_vm->_animation->callSpecial(3); // Zap!
_vm->_gyro->_takenPen = true;
_vm->_gyro->_objects[Gyro::kObjectPen - 1] = true;
@ -1389,7 +1389,7 @@ void Acci::getProc(char thing) {
break;
case kRoomRobins:
if ((thing == Gyro::kObjectMushroom) & (_vm->_animation->inField(0)) & (_vm->_gyro->_mushroomGrowing)) {
_vm->_celer->drawBackgroundSprite(-1, -1, 2);
_vm->_background->drawBackgroundSprite(-1, -1, 2);
_vm->_scrolls->displayText("Got it!");
_vm->_gyro->_mushroomGrowing = false;
_vm->_gyro->_takenMushroom = true;
@ -1608,8 +1608,8 @@ void Acci::doThat() {
_vm->_gyro->_objects[Gyro::kObjectBadge - 1] = false;
_vm->_gyro->_objects[Gyro::kObjectHabit - 1] = true;
_vm->_gyro->_givenBadgeToIby = true;
_vm->_celer->drawBackgroundSprite(-1, -1, 7);
_vm->_celer->drawBackgroundSprite(-1, -1, 8);
_vm->_background->drawBackgroundSprite(-1, -1, 7);
_vm->_background->drawBackgroundSprite(-1, -1, 8);
} else
heyThanks();
break;
@ -1791,7 +1791,7 @@ void Acci::doThat() {
_vm->_gyro->_objects[Gyro::kObjectLute - 1] = true;
_vm->_lucerna->refreshObjectList();
_vm->_gyro->_wonNim = true;
_vm->_celer->drawBackgroundSprite(-1, -1, 0); // Show the settle with no lute on it.
_vm->_background->drawBackgroundSprite(-1, -1, 0); // Show the settle with no lute on it.
_vm->_lucerna->incScore(7); // 7 points for winning!
if (_vm->_gyro->_playedNim == 1)
@ -1953,11 +1953,11 @@ void Acci::doThat() {
if (_vm->_gyro->_alcoholLevel == 0)
_vm->_lucerna->incScore(3);
_vm->_celer->drawBackgroundSprite(-1, -1, 11);
_vm->_background->drawBackgroundSprite(-1, -1, 11);
_vm->_scrolls->displayText(booze[_thing - 51] + ", please." + Scrolls::kControlRegister + '1' + Scrolls::kControlSpeechBubble);
_vm->_gyro->_drinking = _thing;
_vm->_celer->drawBackgroundSprite(-1, -1, 9);
_vm->_background->drawBackgroundSprite(-1, -1, 9);
_vm->_gyro->_malagauche = 177;
_vm->_timer->addTimer(27, Timer::kProcBuyDrinks, Timer::kReasonDrinks);
break;
@ -1978,12 +1978,12 @@ void Acci::doThat() {
return;
}
_vm->_celer->drawBackgroundSprite(-1, -1, 11);
_vm->_background->drawBackgroundSprite(-1, -1, 11);
Common::String tmpStr = Common::String::format("Wine, please.%c1%c", Scrolls::kControlRegister, Scrolls::kControlSpeechBubble);
_vm->_scrolls->displayText(tmpStr);
if (_vm->_gyro->_alcoholLevel == 0)
_vm->_lucerna->incScore(3);
_vm->_celer->drawBackgroundSprite(-1, -1, 9);
_vm->_background->drawBackgroundSprite(-1, -1, 9);
_vm->_gyro->_malagauche = 177;
_vm->_timer->addTimer(27, Timer::kProcBuyWine, Timer::kReasonDrinks);
@ -2153,7 +2153,7 @@ void Acci::doThat() {
_vm->_gyro->_avvyIsAwake = true;
_vm->_lucerna->incScore(1);
_vm->_gyro->_avvyInBed = true;
_vm->_celer->drawBackgroundSprite(-1, -1, 2); // Picture of Avvy, awake in bed.
_vm->_background->drawBackgroundSprite(-1, -1, 2); // Picture of Avvy, awake in bed.
if (_vm->_gyro->_teetotal)
_vm->_scrolls->displayScrollChain('d', 13);
} else

114
engines/avalanche/animation.cpp
View file

@ -33,7 +33,7 @@
#include "avalanche/scrolls.h"
#include "avalanche/lucerna.h"
#include "avalanche/gyro.h"
#include "avalanche/celer.h"
#include "avalanche/background.h"
#include "avalanche/sequence.h"
#include "avalanche/timer.h"
@ -464,59 +464,59 @@ void Animation::catacombMove(byte ped) {
_vm->_gyro->_magics[1]._operation = Gyro::kMagicBounce; // Sloping wall.
_vm->_gyro->_magics[2]._operation = Gyro::kMagicNothing; // Straight wall.
_vm->_gyro->_portals[4]._operation = Gyro::kMagicNothing; // Door.
_vm->_celer->drawBackgroundSprite(-1, -1, 27);
_vm->_background->drawBackgroundSprite(-1, -1, 27);
break;
case 0x1: // no connection (wall + shield),
_vm->_gyro->_magics[1]._operation = Gyro::kMagicBounce; // Sloping wall.
_vm->_gyro->_magics[2]._operation = Gyro::kMagicNothing; // Straight wall.
_vm->_gyro->_portals[4]._operation = Gyro::kMagicNothing; // Door.
_vm->_celer->drawBackgroundSprite(-1, -1, 27); // Wall, plus...
_vm->_celer->drawBackgroundSprite(-1, -1, 28); // ...shield.
_vm->_background->drawBackgroundSprite(-1, -1, 27); // Wall, plus...
_vm->_background->drawBackgroundSprite(-1, -1, 28); // ...shield.
break;
case 0x2: // wall with door
_vm->_gyro->_magics[1]._operation = Gyro::kMagicBounce; // Sloping wall.
_vm->_gyro->_magics[2]._operation = Gyro::kMagicNothing; // Straight wall.
_vm->_gyro->_portals[4]._operation = Gyro::kMagicSpecial; // Door.
_vm->_celer->drawBackgroundSprite(-1, -1, 27); // Wall, plus...
_vm->_celer->drawBackgroundSprite(-1, -1, 29); // ...door.
_vm->_background->drawBackgroundSprite(-1, -1, 27); // Wall, plus...
_vm->_background->drawBackgroundSprite(-1, -1, 29); // ...door.
break;
case 0x3: // wall with door and shield
_vm->_gyro->_magics[1]._operation = Gyro::kMagicBounce; // Sloping wall.
_vm->_gyro->_magics[2]._operation = Gyro::kMagicNothing; // Straight wall.
_vm->_gyro->_portals[4]._operation = Gyro::kMagicSpecial; // Door.
_vm->_celer->drawBackgroundSprite(-1, -1, 27); // Wall, plus...
_vm->_celer->drawBackgroundSprite(-1, -1, 29); // ...door, and...
_vm->_celer->drawBackgroundSprite(-1, -1, 28); // ...shield.
_vm->_background->drawBackgroundSprite(-1, -1, 27); // Wall, plus...
_vm->_background->drawBackgroundSprite(-1, -1, 29); // ...door, and...
_vm->_background->drawBackgroundSprite(-1, -1, 28); // ...shield.
break;
case 0x4: // no connection (wall + window),
_vm->_gyro->_magics[1]._operation = Gyro::kMagicBounce; // Sloping wall.
_vm->_gyro->_magics[2]._operation = Gyro::kMagicNothing; // Straight wall.
_vm->_gyro->_portals[4]._operation = Gyro::kMagicNothing; // Door.
_vm->_celer->drawBackgroundSprite(-1, -1, 27); // Wall, plus...
_vm->_celer->drawBackgroundSprite(-1, -1, 4); // ...window.
_vm->_background->drawBackgroundSprite(-1, -1, 27); // Wall, plus...
_vm->_background->drawBackgroundSprite(-1, -1, 4); // ...window.
break;
case 0x5: // wall with door and window
_vm->_gyro->_magics[1]._operation = Gyro::kMagicBounce; // Sloping wall.
_vm->_gyro->_magics[2]._operation = Gyro::kMagicNothing; // Straight wall.
_vm->_gyro->_portals[4]._operation = Gyro::kMagicSpecial; // Door.
_vm->_celer->drawBackgroundSprite(-1, -1, 27); // Wall, plus...
_vm->_celer->drawBackgroundSprite(-1, -1, 29); // ...door, and...
_vm->_celer->drawBackgroundSprite(-1, -1, 4); // ...window.
_vm->_background->drawBackgroundSprite(-1, -1, 27); // Wall, plus...
_vm->_background->drawBackgroundSprite(-1, -1, 29); // ...door, and...
_vm->_background->drawBackgroundSprite(-1, -1, 4); // ...window.
break;
case 0x6: // no connection (wall + torches),
_vm->_gyro->_magics[1]._operation = Gyro::kMagicBounce; // Sloping wall.
_vm->_gyro->_magics[2]._operation = Gyro::kMagicNothing; // Straight wall.
_vm->_gyro->_portals[4]._operation = Gyro::kMagicNothing; // No door.
_vm->_celer->drawBackgroundSprite(-1, -1, 27); // Wall, plus...
_vm->_celer->drawBackgroundSprite(-1, -1, 6); // ...torches.
_vm->_background->drawBackgroundSprite(-1, -1, 27); // Wall, plus...
_vm->_background->drawBackgroundSprite(-1, -1, 6); // ...torches.
break;
case 0x7: // wall with door and torches
_vm->_gyro->_magics[1]._operation = Gyro::kMagicBounce; // Sloping wall.
_vm->_gyro->_magics[2]._operation = Gyro::kMagicNothing; // Straight wall.
_vm->_gyro->_portals[4]._operation = Gyro::kMagicSpecial; // Door.
_vm->_celer->drawBackgroundSprite(-1, -1, 27); // Wall, plus...
_vm->_celer->drawBackgroundSprite(-1, -1, 29); // ...door, and...
_vm->_celer->drawBackgroundSprite(-1, -1, 6); // ...torches.
_vm->_background->drawBackgroundSprite(-1, -1, 27); // Wall, plus...
_vm->_background->drawBackgroundSprite(-1, -1, 29); // ...door, and...
_vm->_background->drawBackgroundSprite(-1, -1, 6); // ...torches.
break;
case 0xf: // straight-through corridor.
_vm->_gyro->_magics[1]._operation = Gyro::kMagicNothing; // Sloping wall.
@ -531,44 +531,44 @@ void Animation::catacombMove(byte ped) {
_vm->_gyro->_magics[4]._operation = Gyro::kMagicBounce; // Sloping wall.
_vm->_gyro->_magics[5]._operation = Gyro::kMagicNothing; // Straight wall.
_vm->_gyro->_portals[6]._operation = Gyro::kMagicNothing; // Door.
_vm->_celer->drawBackgroundSprite(-1, -1, 18);
_vm->_background->drawBackgroundSprite(-1, -1, 18);
break;
case 0x1: // no connection (wall + window),
_vm->_gyro->_magics[4]._operation = Gyro::kMagicBounce; // Sloping wall.
_vm->_gyro->_magics[5]._operation = Gyro::kMagicNothing; // Straight wall.
_vm->_gyro->_portals[6]._operation = Gyro::kMagicNothing; // Door.
_vm->_celer->drawBackgroundSprite(-1, -1, 18); // Wall, plus...
_vm->_celer->drawBackgroundSprite(-1, -1, 19); // ...window.
_vm->_background->drawBackgroundSprite(-1, -1, 18); // Wall, plus...
_vm->_background->drawBackgroundSprite(-1, -1, 19); // ...window.
break;
case 0x2: // wall with door
_vm->_gyro->_magics[4]._operation = Gyro::kMagicBounce; // Sloping wall.
_vm->_gyro->_magics[5]._operation = Gyro::kMagicNothing; // Straight wall.
_vm->_gyro->_portals[6]._operation = Gyro::kMagicSpecial; // Door.
_vm->_celer->drawBackgroundSprite(-1, -1, 18); // Wall, plus...
_vm->_celer->drawBackgroundSprite(-1, -1, 20); // ...door.
_vm->_background->drawBackgroundSprite(-1, -1, 18); // Wall, plus...
_vm->_background->drawBackgroundSprite(-1, -1, 20); // ...door.
break;
case 0x3: // wall with door and window
_vm->_gyro->_magics[4]._operation = Gyro::kMagicBounce; // Sloping wall.
_vm->_gyro->_magics[5]._operation = Gyro::kMagicNothing; // Straight wall.
_vm->_gyro->_portals[6]._operation = Gyro::kMagicSpecial; // Door.
_vm->_celer->drawBackgroundSprite(-1, -1, 18); // Wall, plus...
_vm->_celer->drawBackgroundSprite(-1, -1, 19); // ...door, and...
_vm->_celer->drawBackgroundSprite(-1, -1, 20); // ...window.
_vm->_background->drawBackgroundSprite(-1, -1, 18); // Wall, plus...
_vm->_background->drawBackgroundSprite(-1, -1, 19); // ...door, and...
_vm->_background->drawBackgroundSprite(-1, -1, 20); // ...window.
break;
case 0x6: // no connection (wall + torches),
_vm->_gyro->_magics[4]._operation = Gyro::kMagicBounce; // Sloping wall.
_vm->_gyro->_magics[5]._operation = Gyro::kMagicNothing; // Straight wall.
_vm->_gyro->_portals[6]._operation = Gyro::kMagicNothing; // No door.
_vm->_celer->drawBackgroundSprite(-1, -1, 18); // Wall, plus...
_vm->_celer->drawBackgroundSprite(-1, -1, 17); // ...torches.
_vm->_background->drawBackgroundSprite(-1, -1, 18); // Wall, plus...
_vm->_background->drawBackgroundSprite(-1, -1, 17); // ...torches.
break;
case 0x7: // wall with door and torches
_vm->_gyro->_magics[4]._operation = Gyro::kMagicBounce; // Sloping wall.
_vm->_gyro->_magics[5]._operation = Gyro::kMagicNothing; // Straight wall.
_vm->_gyro->_portals[6]._operation = Gyro::kMagicSpecial; // Door.
_vm->_celer->drawBackgroundSprite(-1, -1, 18); // Wall, plus...
_vm->_celer->drawBackgroundSprite(-1, -1, 20); // ...door, and...
_vm->_celer->drawBackgroundSprite(-1, -1, 17); // ...torches.
_vm->_background->drawBackgroundSprite(-1, -1, 18); // Wall, plus...
_vm->_background->drawBackgroundSprite(-1, -1, 20); // ...door, and...
_vm->_background->drawBackgroundSprite(-1, -1, 17); // ...torches.
break;
case 0xf: // straight-through corridor.
_vm->_gyro->_magics[4]._operation = Gyro::kMagicNothing; // Sloping wall.
@ -586,7 +586,7 @@ void Animation::catacombMove(byte ped) {
_vm->_gyro->_magics[12]._operation = Gyro::kMagicBounce;
break;
case 0x1:
_vm->_celer->drawBackgroundSprite(-1, -1, 21);
_vm->_background->drawBackgroundSprite(-1, -1, 21);
if ((xy_uint16 == 2051) && (_vm->_gyro->_geidaFollows))
_vm->_gyro->_magics[12]._operation = Gyro::kMagicExclaim;
@ -597,13 +597,13 @@ void Animation::catacombMove(byte ped) {
_vm->_gyro->_magics[11]._operation = Gyro::kMagicBounce;
break;
case 0x2:
_vm->_celer->drawBackgroundSprite(-1, -1, 22);
_vm->_background->drawBackgroundSprite(-1, -1, 22);
_vm->_gyro->_magics[6]._operation = Gyro::kMagicSpecial; // Middle exit south.
_vm->_gyro->_magics[11]._operation = Gyro::kMagicBounce;
_vm->_gyro->_magics[12]._operation = Gyro::kMagicBounce;
break;
case 0x3:
_vm->_celer->drawBackgroundSprite(-1, -1, 23);
_vm->_background->drawBackgroundSprite(-1, -1, 23);
_vm->_gyro->_magics[11]._operation = Gyro::kMagicSpecial; // Left exit south.
_vm->_gyro->_magics[6]._operation = Gyro::kMagicBounce;
_vm->_gyro->_magics[12]._operation = Gyro::kMagicBounce;
@ -624,7 +624,7 @@ void Animation::catacombMove(byte ped) {
break;
#endif
case 0x2:
_vm->_celer->drawBackgroundSprite(-1, -1, 3);
_vm->_background->drawBackgroundSprite(-1, -1, 3);
_vm->_gyro->_magics[0]._operation = Gyro::kMagicBounce; // Middle exit north.
_vm->_gyro->_portals[3]._operation = Gyro::kMagicSpecial; // Door.
break;
@ -642,7 +642,7 @@ void Animation::catacombMove(byte ped) {
break;
#endif
case 0x5:
_vm->_celer->drawBackgroundSprite(-1, -1, 2);
_vm->_background->drawBackgroundSprite(-1, -1, 2);
_vm->_gyro->_magics[0]._operation = Gyro::kMagicBounce; // Middle exit north.
_vm->_gyro->_portals[3]._operation = Gyro::kMagicSpecial; // Door.
break;
@ -657,12 +657,12 @@ void Animation::catacombMove(byte ped) {
case 0x7:
case 0x8:
case 0x9:
_vm->_celer->drawBackgroundSprite(-1, -1, 5);
_vm->_background->drawBackgroundSprite(-1, -1, 5);
if (((here & 0xf000) >> 12) > 0x7)
_vm->_celer->drawBackgroundSprite(-1, -1, 30);
_vm->_background->drawBackgroundSprite(-1, -1, 30);
if (((here & 0xf000) >> 12) == 0x9)
_vm->_celer->drawBackgroundSprite(-1, -1, 31);
_vm->_background->drawBackgroundSprite(-1, -1, 31);
_vm->_gyro->_magics[0]._operation = Gyro::kMagicSpecial; // Middle arch north.
_vm->_gyro->_portals[3]._operation = Gyro::kMagicNothing; // Door.
@ -671,50 +671,50 @@ void Animation::catacombMove(byte ped) {
case 0xd: // No connection + WINDOW
_vm->_gyro->_magics[0]._operation = Gyro::kMagicBounce;
_vm->_gyro->_portals[3]._operation = Gyro::kMagicNothing; // Door.
_vm->_celer->drawBackgroundSprite(-1, -1, 13);
_vm->_background->drawBackgroundSprite(-1, -1, 13);
break;
case 0xe: // No connection + TORCH
_vm->_gyro->_magics[0]._operation = Gyro::kMagicBounce;
_vm->_gyro->_portals[3]._operation = Gyro::kMagicNothing; // Door.
_vm->_celer->drawBackgroundSprite(-1, -1, 7);
_vm->_background->drawBackgroundSprite(-1, -1, 7);
break;
// Recessed door:
case 0xf:
_vm->_gyro->_magics[0]._operation = Gyro::kMagicNothing; // Door to Geida's room.
_vm->_celer->drawBackgroundSprite(-1, -1, 0);
_vm->_background->drawBackgroundSprite(-1, -1, 0);
_vm->_gyro->_portals[3]._operation = Gyro::kMagicSpecial; // Door.
break;
}
switch (xy_uint16) {
case 514:
_vm->_celer->drawBackgroundSprite(-1, -1, 16);
_vm->_background->drawBackgroundSprite(-1, -1, 16);
break; // [2,2] : "Art Gallery" sign over door.
case 264:
_vm->_celer->drawBackgroundSprite(-1, -1, 8);
_vm->_background->drawBackgroundSprite(-1, -1, 8);
break; // [8,1] : "The Wrong Way!" sign.
case 1797:
_vm->_celer->drawBackgroundSprite(-1, -1, 1);
_vm->_background->drawBackgroundSprite(-1, -1, 1);
break; // [5,7] : "Ite Mingite" sign.
case 258:
for (int i = 0; i <= 2; i++) { // [2,1] : Art gallery - pictures
_vm->_celer->drawBackgroundSprite(130 + i * 120, 70, 14);
_vm->_celer->drawBackgroundSprite(184 + i * 120, 78, 15);
_vm->_background->drawBackgroundSprite(130 + i * 120, 70, 14);
_vm->_background->drawBackgroundSprite(184 + i * 120, 78, 15);
}
break;
case 1287:
for (int i = 10; i <= 13; i++)
_vm->_celer->drawBackgroundSprite(-1, -1, i - 1);
_vm->_background->drawBackgroundSprite(-1, -1, i - 1);
break; // [7,5] : 4 candles.
case 776:
_vm->_celer->drawBackgroundSprite(-1, -1, 9);
_vm->_background->drawBackgroundSprite(-1, -1, 9);
break; // [8,3] : 1 candle.
case 2049:
_vm->_celer->drawBackgroundSprite(-1, -1, 10);
_vm->_background->drawBackgroundSprite(-1, -1, 10);
break; // [1,8] : another candle.
case 257:
_vm->_celer->drawBackgroundSprite(-1, -1, 11);
_vm->_celer->drawBackgroundSprite(-1, -1, 12);
_vm->_background->drawBackgroundSprite(-1, -1, 11);
_vm->_background->drawBackgroundSprite(-1, -1, 12);
break; // [1,1] : the other two.
}
@ -735,7 +735,7 @@ void Animation::dawnDelay() {
void Animation::callSpecial(uint16 which) {
switch (which) {
case 1: // _vm->_gyro->special 1: Room 22: top of stairs.
_vm->_celer->drawBackgroundSprite(-1, -1, 0);
_vm->_background->drawBackgroundSprite(-1, -1, 0);
_vm->_gyro->_brummieStairs = 1;
_vm->_gyro->_magics[9]._operation = Gyro::kMagicNothing;
_vm->_timer->addTimer(10, Timer::kProcStairs, Timer::kReasonBrummieStairs);
@ -782,7 +782,7 @@ void Animation::callSpecial(uint16 which) {
_vm->_scrolls->displayScrollChain('q', 35);
_sprites[0].remove();
//tr[1].vanishifstill:=true;
_vm->_celer->drawBackgroundSprite(-1, -1, 1);
_vm->_background->drawBackgroundSprite(-1, -1, 1);
_vm->_scrolls->displayScrollChain('q', 36);
_vm->_gyro->_tiedUp = true;
_vm->_gyro->_friarWillTieYouUp = false;
@ -1075,7 +1075,7 @@ void Animation::arrowProcs(byte tripnum) {
}
} else { // Arrow has hit the wall!
_sprites[tripnum].remove(); // Deallocate the arrow.
_vm->_celer->drawBackgroundSprite(-1, -1, 2); // Show pic of arrow stuck into the door.
_vm->_background->drawBackgroundSprite(-1, -1, 2); // Show pic of arrow stuck into the door.
_vm->_gyro->_arrowInTheDoor = true; // So that we can pick it up.
}
@ -1301,7 +1301,7 @@ void Animation::hideInCupboard() {
"but dusty, cupboard. Hmmmm... you leave the door slightly open to avoid suffocation.", Scrolls::kControlParagraph);
_vm->_scrolls->displayText(tmpStr);
_vm->_gyro->_avvysInTheCupboard = true;
_vm->_celer->drawBackgroundSprite(-1, -1, 7);
_vm->_background->drawBackgroundSprite(-1, -1, 7);
}
}

8
engines/avalanche/avalanche.cpp
View file

@ -65,7 +65,7 @@ AvalancheEngine::~AvalancheEngine() {
delete _pingo;
delete _scrolls;
delete _lucerna;
delete _celer;
delete _background;
delete _sequence;
delete _timer;
delete _animation;
@ -85,7 +85,7 @@ Common::ErrorCode AvalancheEngine::initialize() {
_pingo = new Pingo(this);
_scrolls = new Scrolls(this);
_lucerna = new Lucerna(this);
_celer = new Celer(this);
_background = new Background(this);
_sequence = new Sequence(this);
_timer = new Timer(this);
_animation = new Animation(this);
@ -440,7 +440,7 @@ bool AvalancheEngine::loadGame(const int16 slot) {
_lucerna->dawn();
}
_celer->forgetBackgroundSprites();
_background->forgetBackgroundSprites();
_lucerna->minorRedraw();
_menu->setup();
_gyro->_whereIs[Gyro::kPeopleAvalot - 150] = _gyro->_room;
@ -450,7 +450,7 @@ bool AvalancheEngine::loadGame(const int16 slot) {
_lucerna->drawDirection();
_gyro->_onToolbar = false;
_animation->animLink();
_celer->updateBackgroundSprites();
_background->updateBackgroundSprites();
Common::String tmpStr = Common::String::format("%cLoaded: %c%s.ASG%c%c%c%s%c%csaved on %s.",
Scrolls::kControlItalic, Scrolls::kControlRoman, description.c_str(), Scrolls::kControlCenter,

4
engines/avalanche/avalanche.h
View file

@ -38,7 +38,7 @@
#include "avalanche/pingo.h"
#include "avalanche/scrolls.h"
#include "avalanche/lucerna.h"
#include "avalanche/celer.h"
#include "avalanche/background.h"
#include "avalanche/sequence.h"
#include "avalanche/timer.h"
#include "avalanche/animation.h"
@ -74,7 +74,7 @@ public:
Pingo *_pingo;
Scrolls *_scrolls;
Lucerna *_lucerna;
Celer *_celer;
Background *_background;
Sequence *_sequence;
Timer *_timer;
Animation *_animation;

4
engines/avalanche/avalot.cpp
View file

@ -38,7 +38,7 @@
#include "avalanche/menu.h"
#include "avalanche/pingo.h"
#include "avalanche/timer.h"
#include "avalanche/celer.h"
#include "avalanche/background.h"
#include "avalanche/closing.h"
#include "common/str.h"
@ -174,7 +174,7 @@ void Avalot::run(Common::String arg) {
_vm->_lucerna->_clock.update();
_vm->_menu->update();
_vm->_celer->updateBackgroundSprites();
_vm->_background->updateBackgroundSprites();
_vm->_animation->animLink();
_vm->_lucerna->checkClick();
_vm->_timer->updateTimer();

18
engines/avalanche/celer.cpp → engines/avalanche/background.cpp
View file

@ -29,7 +29,7 @@
#include "avalanche/avalanche.h"
#include "avalanche/celer.h"
#include "avalanche/background.h"
#include "avalanche/animation.h"
#include "avalanche/lucerna.h"
#include "avalanche/gyro.h"
@ -39,21 +39,21 @@
namespace Avalanche {
const int16 Celer::kOnDisk = -1;
const int16 Background::kOnDisk = -1;
Celer::Celer(AvalancheEngine *vm) {
Background::Background(AvalancheEngine *vm) {
_vm = vm;
_spriteNum = 0;
}
Celer::~Celer() {
Background::~Background() {
forgetBackgroundSprites();
}
/**
* @remarks Originally called 'pics_link'
*/
void Celer::updateBackgroundSprites() {
void Background::updateBackgroundSprites() {
if (_vm->_menu->isActive())
return; // No animation when the menus are up.
@ -265,7 +265,7 @@ void Celer::updateBackgroundSprites() {
}
}
void Celer::loadBackgroundSprites(byte number) {
void Background::loadBackgroundSprites(byte number) {
Common::File f;
_filename = _filename.format("chunk%d.avd", number);
if (!f.open(_filename))
@ -315,7 +315,7 @@ void Celer::loadBackgroundSprites(byte number) {
f.close();
}
void Celer::forgetBackgroundSprites() {
void Background::forgetBackgroundSprites() {
for (int i = 0; i < _spriteNum; i++) {
if (_sprites[i]._x > kOnDisk)
_sprites[i]._picture.free();
@ -326,7 +326,7 @@ void Celer::forgetBackgroundSprites() {
* Draw background animation
* @remarks Originally called 'show_one'
*/
void Celer::drawBackgroundSprite(int16 destX, int16 destY, byte sprId) {
void Background::drawBackgroundSprite(int16 destX, int16 destY, byte sprId) {
if (_sprites[sprId]._x > kOnDisk) {
if (destX < 0) {
destX = _sprites[sprId]._x * 8;
@ -363,7 +363,7 @@ void Celer::drawBackgroundSprite(int16 destX, int16 destY, byte sprId) {
void Celer::drawSprite(int16 x, int16 y, SpriteType &sprite) {
void Background::drawSprite(int16 x, int16 y, SpriteType &sprite) {
_r._x1 = x;
_r._y1 = y;
_r._y2 = y + sprite._yl;

6
engines/avalanche/celer.h → engines/avalanche/background.h
View file

@ -39,10 +39,10 @@
namespace Avalanche {
class AvalancheEngine;
class Celer {
class Background {
public:
Celer(AvalancheEngine *vm);
~Celer();
Background(AvalancheEngine *vm);
~Background();
void updateBackgroundSprites();
void loadBackgroundSprites(byte number);

52
engines/avalanche/lucerna.cpp
View file

@ -34,7 +34,7 @@
#include "avalanche/scrolls.h"
#include "avalanche/timer.h"
#include "avalanche/animation.h"
#include "avalanche/celer.h"
#include "avalanche/background.h"
#include "avalanche/pingo.h"
#include "avalanche/sequence.h"
#include "avalanche/acci.h"
@ -320,7 +320,7 @@ void Lucerna::loadRoom(byte num) {
file.close();
loadAlso(num);
_vm->_celer->loadBackgroundSprites(num);
_vm->_background->loadBackgroundSprites(num);
CursorMan.showMouse(true);
}
@ -341,7 +341,7 @@ void Lucerna::findPeople(byte room) {
void Lucerna::exitRoom(byte x) {
_vm->_sound->stopSound();
_vm->_celer->forgetBackgroundSprites();
_vm->_background->forgetBackgroundSprites();
_vm->_gyro->_seeScroll = true; // This stops the trippancy system working over the length of this procedure.
switch (x) {
@ -444,7 +444,7 @@ void Lucerna::enterRoom(byte room, byte ped) {
switch (room) {
case kRoomYours:
if (_vm->_gyro->_avvyInBed) {
_vm->_celer->drawBackgroundSprite(-1, -1, 2);
_vm->_background->drawBackgroundSprite(-1, -1, 2);
_vm->_graphics->refreshBackground();
_vm->_timer->addTimer(100, Timer::kProcArkataShouts, Timer::kReasonArkataShouts);
}
@ -544,7 +544,7 @@ void Lucerna::enterRoom(byte room, byte ped) {
case kRoomBridge:
if (_vm->_gyro->_drawbridgeOpen == 4) { // open
_vm->_celer->drawBackgroundSprite(-1, -1, 2); // Position of drawbridge
_vm->_background->drawBackgroundSprite(-1, -1, 2); // Position of drawbridge
_vm->_graphics->refreshBackground();
_vm->_gyro->_magics[kColorGreen - 1]._operation = Gyro::kMagicNothing; // You may enter the drawbridge.
}
@ -570,10 +570,10 @@ void Lucerna::enterRoom(byte room, byte ped) {
}
if (_vm->_gyro->_tiedUp)
_vm->_celer->drawBackgroundSprite(-1, -1, 1);
_vm->_background->drawBackgroundSprite(-1, -1, 1);
if (!_vm->_gyro->_mushroomGrowing)
_vm->_celer->drawBackgroundSprite(-1, -1, 2);
_vm->_background->drawBackgroundSprite(-1, -1, 2);
_vm->_graphics->refreshBackground();
break;
@ -647,11 +647,11 @@ void Lucerna::enterRoom(byte room, byte ped) {
case kRoomArgentPub:
if (_vm->_gyro->_wonNim)
_vm->_celer->drawBackgroundSprite(-1, -1, 0); // No lute by the settle.
_vm->_background->drawBackgroundSprite(-1, -1, 0); // No lute by the settle.
_vm->_gyro->_malagauche = 0; // Ready to boot Malagauche
if (_vm->_gyro->_givenBadgeToIby) {
_vm->_celer->drawBackgroundSprite(-1, -1, 7);
_vm->_celer->drawBackgroundSprite(-1, -1, 8);
_vm->_background->drawBackgroundSprite(-1, -1, 7);
_vm->_background->drawBackgroundSprite(-1, -1, 8);
}
_vm->_graphics->refreshBackground();
break;
@ -667,7 +667,7 @@ void Lucerna::enterRoom(byte room, byte ped) {
if (_vm->_gyro->_geidaFollows) {
putGeidaAt(4, ped);
if (_vm->_gyro->_lustieIsAsleep) {
_vm->_celer->drawBackgroundSprite(-1, -1, 4);
_vm->_background->drawBackgroundSprite(-1, -1, 4);
_vm->_graphics->refreshBackground();
}
}
@ -676,14 +676,14 @@ void Lucerna::enterRoom(byte room, byte ped) {
case kRoomMusicRoom:
if (_vm->_gyro->_jacquesState > 0) {
_vm->_gyro->_jacquesState = 5;
_vm->_celer->drawBackgroundSprite(-1, -1, 1);
_vm->_background->drawBackgroundSprite(-1, -1, 1);
_vm->_graphics->refreshBackground();
_vm->_celer->drawBackgroundSprite(-1, -1, 3);
_vm->_background->drawBackgroundSprite(-1, -1, 3);
_vm->_gyro->_magics[kColorBrown - 1]._operation = Gyro::kMagicNothing;
_vm->_gyro->_whereIs[Gyro::kPeopleJacques - 150] = 0;
}
if (ped != 0) {
_vm->_celer->drawBackgroundSprite(-1, -1, 5);
_vm->_background->drawBackgroundSprite(-1, -1, 5);
_vm->_graphics->refreshBackground();
_vm->_sequence->firstShow(6);
_vm->_sequence->thenShow(5);
@ -694,7 +694,7 @@ void Lucerna::enterRoom(byte room, byte ped) {
case kRoomOutsideNottsPub:
if (ped == 2) {
_vm->_celer->drawBackgroundSprite(-1, -1, 2);
_vm->_background->drawBackgroundSprite(-1, -1, 2);
_vm->_graphics->refreshBackground();
_vm->_sequence->firstShow(3);
_vm->_sequence->thenShow(2);
@ -706,7 +706,7 @@ void Lucerna::enterRoom(byte room, byte ped) {
case kRoomOutsideArgentPub:
if (ped == 2) {
_vm->_celer->drawBackgroundSprite(-1, -1, 5);
_vm->_background->drawBackgroundSprite(-1, -1, 5);
_vm->_graphics->refreshBackground();
_vm->_sequence->firstShow(6);
_vm->_sequence->thenShow(5);
@ -734,7 +734,7 @@ void Lucerna::enterRoom(byte room, byte ped) {
case kRoomInsideCardiffCastle:
if (ped > 0) {
_vm->_animation->_sprites[1].init(10, false, _vm->_animation); // Define the dart.
_vm->_celer->drawBackgroundSprite(-1, -1, 0);
_vm->_background->drawBackgroundSprite(-1, -1, 0);
_vm->_graphics->refreshBackground();
_vm->_sequence->firstShow(1);
if (_vm->_gyro->_arrowInTheDoor)
@ -743,22 +743,22 @@ void Lucerna::enterRoom(byte room, byte ped) {
_vm->_sequence->thenShow(2);
if (_vm->_gyro->_takenPen)
_vm->_celer->drawBackgroundSprite(-1, -1, 3);
_vm->_background->drawBackgroundSprite(-1, -1, 3);
_vm->_sequence->startToClose();
} else {
_vm->_celer->drawBackgroundSprite(-1, -1, 0);
_vm->_background->drawBackgroundSprite(-1, -1, 0);
if (_vm->_gyro->_arrowInTheDoor)
_vm->_celer->drawBackgroundSprite(-1, -1, 2);
_vm->_background->drawBackgroundSprite(-1, -1, 2);
else
_vm->_celer->drawBackgroundSprite(-1, -1, 1);
_vm->_background->drawBackgroundSprite(-1, -1, 1);
_vm->_graphics->refreshBackground();
}
break;
case kRoomAvvysGarden:
if (ped == 1) {
_vm->_celer->drawBackgroundSprite(-1, -1, 1);
_vm->_background->drawBackgroundSprite(-1, -1, 1);
_vm->_graphics->refreshBackground();
_vm->_sequence->firstShow(2);
_vm->_sequence->thenShow(1);
@ -779,7 +779,7 @@ void Lucerna::enterRoom(byte room, byte ped) {
_vm->_sequence->start_to_close();
#endif
_vm->_celer->drawBackgroundSprite(-1, -1, 1);
_vm->_background->drawBackgroundSprite(-1, -1, 1);
_vm->_graphics->refreshBackground();
_vm->_sequence->firstShow(2);
_vm->_sequence->thenShow(1);
@ -790,7 +790,7 @@ void Lucerna::enterRoom(byte room, byte ped) {
case kRoomAylesOffice:
if (_vm->_gyro->_aylesIsAwake)
_vm->_celer->drawBackgroundSprite(-1, -1, 1);
_vm->_background->drawBackgroundSprite(-1, -1, 1);
_vm->_graphics->refreshBackground();
break; // Ayles awake.
@ -811,14 +811,14 @@ void Lucerna::enterRoom(byte room, byte ped) {
case kRoomNottsPub:
if (_vm->_gyro->_sittingInPub)
_vm->_celer->drawBackgroundSprite(-1, -1, 2);
_vm->_background->drawBackgroundSprite(-1, -1, 2);
_vm->_gyro->_npcFacing = 1; // Port.
break;
case kRoomOutsideDucks:
if (ped == 2) {
// Shut the door
_vm->_celer->drawBackgroundSprite(-1, -1, 2);
_vm->_background->drawBackgroundSprite(-1, -1, 2);
_vm->_graphics->refreshBackground();
_vm->_sequence->firstShow(3);
_vm->_sequence->firstShow(2);

2
engines/avalanche/module.mk
View file

@ -11,7 +11,7 @@ MODULE_OBJS = \
pingo.o \
scrolls.o \
lucerna.o \
celer.o \
background.o \
sequence.o \
timer.o \
animation.o \

4
engines/avalanche/sequence.cpp
View file

@ -32,7 +32,7 @@
#include "avalanche/sequence.h"
#include "avalanche/gyro.h"
#include "avalanche/timer.h"
#include "avalanche/celer.h"
#include "avalanche/background.h"
#include "avalanche/animation.h"
#include "common/scummsys.h"
@ -98,7 +98,7 @@ void Sequence::callSequencer() {
if ((_seq[0] >= 1) && (_seq[0] <= 176)) {
// Show a frame.
_vm->_celer->drawBackgroundSprite(-1, -1, _seq[0] - 1);
_vm->_background->drawBackgroundSprite(-1, -1, _seq[0] - 1);
shoveLeft();
}

26
engines/avalanche/timer.cpp
View file

@ -232,7 +232,7 @@ void Timer::loseTimer(byte which) {
void Timer::openDrawbridge() {
_vm->_gyro->_drawbridgeOpen++;
_vm->_celer->drawBackgroundSprite(-1, -1, _vm->_gyro->_drawbridgeOpen - 2);
_vm->_background->drawBackgroundSprite(-1, -1, _vm->_gyro->_drawbridgeOpen - 2);
if (_vm->_gyro->_drawbridgeOpen == 4)
_vm->_gyro->_magics[1]._operation = Gyro::kMagicNothing; // You may enter the drawbridge.
@ -274,7 +274,7 @@ void Timer::bang2() {
void Timer::stairs() {
_vm->_sound->blip();
_vm->_animation->_sprites[0].walkTo(3);
_vm->_celer->drawBackgroundSprite(-1, -1, 1);
_vm->_background->drawBackgroundSprite(-1, -1, 1);
_vm->_gyro->_brummieStairs = 2;
_vm->_gyro->_magics[10]._operation = Gyro::kMagicSpecial;
_vm->_gyro->_magics[10]._data = 2; // Reached the bottom of the stairs.
@ -393,17 +393,17 @@ void Timer::jacquesWakesUp() {
switch (_vm->_gyro->_jacquesState) { // Additional pictures.
case 1 :
_vm->_celer->drawBackgroundSprite(-1, -1, 0); // Eyes open.
_vm->_background->drawBackgroundSprite(-1, -1, 0); // Eyes open.
_vm->_scrolls->displayScrollChain('Q', 45);
break;
case 2 : // Going through the door.
_vm->_celer->drawBackgroundSprite(-1, -1, 1); // Not on the floor.
_vm->_celer->drawBackgroundSprite(-1, -1, 2); // But going through the door.
_vm->_background->drawBackgroundSprite(-1, -1, 1); // Not on the floor.
_vm->_background->drawBackgroundSprite(-1, -1, 2); // But going through the door.
_vm->_gyro->_magics[5]._operation = Gyro::kMagicNothing; // You can't wake him up now.
break;
case 3 : // Gone through the door.
_vm->_celer->drawBackgroundSprite(-1, -1, 1); // Not on the floor, either.
_vm->_celer->drawBackgroundSprite(-1, -1, 3); // He's gone... so the door's open.
_vm->_background->drawBackgroundSprite(-1, -1, 1); // Not on the floor, either.
_vm->_background->drawBackgroundSprite(-1, -1, 3); // He's gone... so the door's open.
_vm->_gyro->_whereIs[Gyro::kPeopleJacques - 150] = 0; // Gone!
break;
}
@ -433,7 +433,7 @@ void Timer::naughtyDuke() { // This is when the Duke comes in and takes your mon
spr->walkTo(2); // He walks over to you.
// Let's get the door opening.
_vm->_celer->drawBackgroundSprite(-1, -1, 0);
_vm->_background->drawBackgroundSprite(-1, -1, 0);
_vm->_sequence->firstShow(2);
_vm->_sequence->startToClose();
@ -449,7 +449,7 @@ void Timer::naughtyDuke2() {
}
void Timer::naughtyDuke3() {
_vm->_celer->drawBackgroundSprite(-1, -1, 0);
_vm->_background->drawBackgroundSprite(-1, -1, 0);
_vm->_sequence->firstShow(2);
_vm->_sequence->startToClose();
}
@ -491,7 +491,7 @@ void Timer::jump() {
if (_vm->_gyro->_carryNum >= kCarryLimit)
_vm->_scrolls->displayText("You fail to grab it, because your hands are full.");
else {
_vm->_celer->drawBackgroundSprite(-1, -1, 1);
_vm->_background->drawBackgroundSprite(-1, -1, 1);
_vm->_gyro->_arrowInTheDoor = false; // You've got it.
_vm->_gyro->_objects[Gyro::kObjectBolt - 1] = true;
_vm->_lucerna->refreshObjectList();
@ -507,7 +507,7 @@ void Timer::crapulusSaysSpludOut() {
}
void Timer::buyDrinks() {
_vm->_celer->drawBackgroundSprite(-1, -1, 10); // Malagauche gets up again.
_vm->_background->drawBackgroundSprite(-1, -1, 10); // Malagauche gets up again.
_vm->_gyro->_malagauche = 0;
_vm->_scrolls->displayScrollChain('D', _vm->_gyro->_drinking); // Display message about it.
@ -519,7 +519,7 @@ void Timer::buyDrinks() {
}
void Timer::buyWine() {
_vm->_celer->drawBackgroundSprite(-1, -1, 10); // Malagauche gets up again.
_vm->_background->drawBackgroundSprite(-1, -1, 10); // Malagauche gets up again.
_vm->_gyro->_malagauche = 0;
_vm->_scrolls->displayScrollChain('D', 50); // You buy the wine.
@ -629,7 +629,7 @@ void Timer::avvySitDown() {
if (avvy->_homing) // Still walking.
addTimer(1, kProcAvvySitDown, kReasonSittingDown);
else {
_vm->_celer->drawBackgroundSprite(-1, -1, 2);
_vm->_background->drawBackgroundSprite(-1, -1, 2);
_vm->_gyro->_sittingInPub = true;
_vm->_gyro->_userMovesAvvy = false;
avvy->_visible = false;