aboutsummaryrefslogtreecommitdiff
path: root/engines/avalanche/lucerna.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/avalanche/lucerna.cpp')
-rw-r--r--engines/avalanche/lucerna.cpp52
1 files changed, 26 insertions, 26 deletions
diff --git a/engines/avalanche/lucerna.cpp b/engines/avalanche/lucerna.cpp
index 2f3845249d..4143a43ca1 100644
--- a/engines/avalanche/lucerna.cpp
+++ b/engines/avalanche/lucerna.cpp
@@ -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);