aboutsummaryrefslogtreecommitdiff
path: root/engines/avalanche/scrolls2.cpp
diff options
context:
space:
mode:
authorStrangerke2013-09-07 19:09:06 +0200
committerStrangerke2013-09-07 19:11:34 +0200
commitd96555406ec215f390904d15c729ab6528f8b28f (patch)
tree20073574e9e06a22897634bf6297fd7adfe8e638 /engines/avalanche/scrolls2.cpp
parent9097e801537e0e80f2d7df7938f79d145ee362df (diff)
downloadscummvm-rg350-d96555406ec215f390904d15c729ab6528f8b28f.tar.gz
scummvm-rg350-d96555406ec215f390904d15c729ab6528f8b28f.tar.bz2
scummvm-rg350-d96555406ec215f390904d15c729ab6528f8b28f.zip
AVALANCHE: Rename trip into animation, some more renaming
Diffstat (limited to 'engines/avalanche/scrolls2.cpp')
-rw-r--r--engines/avalanche/scrolls2.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/avalanche/scrolls2.cpp b/engines/avalanche/scrolls2.cpp
index 56f605a9d4..c445a7e164 100644
--- a/engines/avalanche/scrolls2.cpp
+++ b/engines/avalanche/scrolls2.cpp
@@ -32,7 +32,7 @@
#include "avalanche/scrolls2.h"
#include "avalanche/gyro2.h"
#include "avalanche/lucerna2.h"
-#include "avalanche/trip6.h"
+#include "avalanche/animation.h"
#include "avalanche/acci2.h"
#include "avalanche/visa2.h"
#include "avalanche/timeout2.h"
@@ -689,11 +689,11 @@ void Scrolls::calldrivers() {
if (param == 0)
natural();
else if ((1 <= param) && (param <= 9)) {
- if ((param > _vm->_trip->kSpriteNumbMax) || (!_vm->_trip->tr[param - 1].quick)) { // Not valid.
+ if ((param > _vm->_animation->kSpriteNumbMax) || (!_vm->_animation->tr[param - 1].quick)) { // Not valid.
_vm->_lucerna->errorLed();
natural();
} else
- _vm->_trip->tr[param - 1].chatter(); // Normal sprite talking routine.
+ _vm->_animation->tr[param - 1].chatter(); // Normal sprite talking routine.
} else if ((10 <= param) && (param <= 36)) {
// Quasi-peds. (This routine performs the same
// thing with QPs as triptype.chatter does with the