diff options
author | Strangerke | 2013-09-21 16:09:33 +0200 |
---|---|---|
committer | Strangerke | 2013-09-21 16:09:33 +0200 |
commit | d82975fc38c9334c15810fff216ab59fd5af5ec2 (patch) | |
tree | 2bfd1c504297a8bee56e738ff1ab1b59fa0b41fa /engines/avalanche | |
parent | ba103fd5dd8ecde9962ccad03b79a440c06f7a7b (diff) | |
download | scummvm-rg350-d82975fc38c9334c15810fff216ab59fd5af5ec2.tar.gz scummvm-rg350-d82975fc38c9334c15810fff216ab59fd5af5ec2.tar.bz2 scummvm-rg350-d82975fc38c9334c15810fff216ab59fd5af5ec2.zip |
AVALANCHE: Add an assert in flipRoom(), fix an issue in post-STU functions
Diffstat (limited to 'engines/avalanche')
-rw-r--r-- | engines/avalanche/animation.cpp | 1 | ||||
-rw-r--r-- | engines/avalanche/timer.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp index c014b95f9e..fafd088b58 100644 --- a/engines/avalanche/animation.cpp +++ b/engines/avalanche/animation.cpp @@ -1258,6 +1258,7 @@ void Animation::hideInCupboard() { } void Animation::flipRoom(byte room, byte ped) { + assert((ped > 0) && (ped < 15)); if (!_vm->_gyro->_alive) { // You can't leave the room if you're dead. _sprites[0]._moveX = 0; diff --git a/engines/avalanche/timer.cpp b/engines/avalanche/timer.cpp index b473e773bd..ac5f096e40 100644 --- a/engines/avalanche/timer.cpp +++ b/engines/avalanche/timer.cpp @@ -353,8 +353,10 @@ void Timer::hangAround2() { void Timer::afterTheShootemup() { - _vm->_animation->flipRoom(_vm->_gyro->_room, 0); + // CHECKME: is it correct? // Only placed this here to replace the minigame. TODO: Remove it when the shoot em' up is implemented! + _vm->_animation->flipRoom(_vm->_gyro->_room, 1); + // _vm->_animation->_sprites[0].init(0, true, _vm->_animation); // Avalot. _vm->_animation->appearPed(0, 1); |