aboutsummaryrefslogtreecommitdiff
path: root/engines/avalanche/animation.h
diff options
context:
space:
mode:
authorStrangerke2013-09-07 20:02:14 +0200
committerStrangerke2013-09-07 20:02:14 +0200
commit9198b166f7b99b9beedf833e0f2e573420db73fc (patch)
treebcad05afc31bb52f3da37cb5bf8254a78a7d2693 /engines/avalanche/animation.h
parentd96555406ec215f390904d15c729ab6528f8b28f (diff)
downloadscummvm-rg350-9198b166f7b99b9beedf833e0f2e573420db73fc.tar.gz
scummvm-rg350-9198b166f7b99b9beedf833e0f2e573420db73fc.tar.bz2
scummvm-rg350-9198b166f7b99b9beedf833e0f2e573420db73fc.zip
AVALANCHE: Some more renaming in Animation
Diffstat (limited to 'engines/avalanche/animation.h')
-rw-r--r--engines/avalanche/animation.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/avalanche/animation.h b/engines/avalanche/animation.h
index b8ae547d8c..91837f1ab9 100644
--- a/engines/avalanche/animation.h
+++ b/engines/avalanche/animation.h
@@ -119,7 +119,7 @@ public:
private:
Animation *_tr;
- bool collision_check();
+ bool checkCollision();
int8 sgn(int16 val);
};
@@ -152,18 +152,18 @@ public:
static const int16 kSpriteNumbMax = 5; // current max no. of sprites
- static const int16 procfollow_avvy_y = 1;
- static const int16 procback_and_forth = 2;
- static const int16 procface_avvy = 3;
- static const int16 procarrow_procs = 4;
- static const int16 procspludwick_procs = 5;
- static const int16 procgrab_avvy = 6;
- static const int16 procgeida_procs = 7;
+ static const int16 kProcFollowAvvyY = 1;
+ static const int16 kProcBackAndForth = 2;
+ static const int16 kProcFaceAvvy = 3;
+ static const int16 kProcArrow = 4;
+ static const int16 kProcsPludwick = 5; // Unused
+ static const int16 kProcGrabAvvy = 6;
+ static const int16 kProcGeida = 7;
Animation(AvalancheEngine *vm);
~Animation();
- void trippancy_link();
+ void animLink();
void get_back_loretta();
void loadtrip();
void call_special(uint16 which);