aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/animator.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2006-09-17 20:21:40 +0000
committerJohannes Schickel2006-09-17 20:21:40 +0000
commitb6a8e38726b55dec5a959ec914c6f9e6fda358d8 (patch)
tree72c3c981e7171789a71aa752485cd45149263e3d /engines/kyra/animator.cpp
parent3e8380f2c6889c85e0e962631eaf9814c2f84963 (diff)
downloadscummvm-rg350-b6a8e38726b55dec5a959ec914c6f9e6fda358d8.tar.gz
scummvm-rg350-b6a8e38726b55dec5a959ec914c6f9e6fda358d8.tar.bz2
scummvm-rg350-b6a8e38726b55dec5a959ec914c6f9e6fda358d8.zip
- removes the kyra specific language flag system, and uses the language enum defined in Common for that now
- also reworks the game flag system in general svn-id: r23920
Diffstat (limited to 'engines/kyra/animator.cpp')
-rw-r--r--engines/kyra/animator.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/animator.cpp b/engines/kyra/animator.cpp
index df8aa8284c..a11e56d65e 100644
--- a/engines/kyra/animator.cpp
+++ b/engines/kyra/animator.cpp
@@ -598,14 +598,14 @@ void ScreenAnimator::makeBrandonFaceMouse() {
int16 ScreenAnimator::fetchAnimWidth(const uint8 *shape, int16 mult) {
debugC(9, kDebugLevelAnimator, "ScreenAnimator::fetchAnimWidth(%p, %d)", (const void *)shape, mult);
- if (_vm->features() & GF_TALKIE)
+ if (_vm->gameFlags().useAltShapeHeader)
shape += 2;
return (((int16)READ_LE_UINT16((shape+3))) * mult) >> 8;
}
int16 ScreenAnimator::fetchAnimHeight(const uint8 *shape, int16 mult) {
debugC(9, kDebugLevelAnimator, "ScreenAnimator::fetchAnimHeight(%p, %d)", (const void *)shape, mult);
- if (_vm->features() & GF_TALKIE)
+ if (_vm->gameFlags().useAltShapeHeader)
shape += 2;
return (int16)(((int8)*(shape+2)) * mult) >> 8;
}