aboutsummaryrefslogtreecommitdiff
path: root/engines/avalanche/sequence.cpp
diff options
context:
space:
mode:
authorStrangerke2013-09-21 22:26:36 +0200
committerStrangerke2013-09-21 22:28:48 +0200
commit4b4f07a7f6e8643080de8048d94e7d22bc7f3753 (patch)
tree49a3150f9069f61192398717af7845baa02d65d2 /engines/avalanche/sequence.cpp
parent89471e76d1177f2cbe5f2b638fe69559de85b84f (diff)
downloadscummvm-rg350-4b4f07a7f6e8643080de8048d94e7d22bc7f3753.tar.gz
scummvm-rg350-4b4f07a7f6e8643080de8048d94e7d22bc7f3753.tar.bz2
scummvm-rg350-4b4f07a7f6e8643080de8048d94e7d22bc7f3753.zip
AVALANCHE: Merge Gyro, Lucerna and Avalot
Diffstat (limited to 'engines/avalanche/sequence.cpp')
-rw-r--r--engines/avalanche/sequence.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/engines/avalanche/sequence.cpp b/engines/avalanche/sequence.cpp
index 712275e73d..8ca3844bc9 100644
--- a/engines/avalanche/sequence.cpp
+++ b/engines/avalanche/sequence.cpp
@@ -29,7 +29,6 @@
#include "avalanche/avalanche.h"
#include "avalanche/sequence.h"
-#include "avalanche/gyro.h"
#include "avalanche/timer.h"
#include "avalanche/background.h"
#include "avalanche/animation.h"
@@ -61,8 +60,8 @@ void Sequence::thenShow(byte what) {
void Sequence::thenFlip(byte where, byte ped) {
thenShow(kNowFlip);
- _vm->_gyro->_flipToWhere = where;
- _vm->_gyro->_flipToPed = ped;
+ _vm->_avalot->_flipToWhere = where;
+ _vm->_avalot->_flipToPed = ped;
}
void Sequence::startToClose() {
@@ -71,7 +70,7 @@ void Sequence::startToClose() {
}
void Sequence::startToOpen() {
- _vm->_gyro->_userMovesAvvy = false; // They can't move.
+ _vm->_avalot->_userMovesAvvy = false; // They can't move.
_vm->_animation->stopWalking(); // And they're not moving now.
startToClose(); // Apart from that, it's the same thing.
}
@@ -90,8 +89,8 @@ void Sequence::callSequencer() {
return; // No more routines.
break;
case 177: // Flip room.
- _vm->_gyro->_userMovesAvvy = true;
- _vm->_animation->flipRoom(_vm->_gyro->_flipToWhere, _vm->_gyro->_flipToPed);
+ _vm->_avalot->_userMovesAvvy = true;
+ _vm->_animation->flipRoom(_vm->_avalot->_flipToWhere, _vm->_avalot->_flipToPed);
if (curSeq == 177)
shoveLeft();
break;