diff options
| author | Matthew Hoops | 2011-04-13 16:04:29 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-04-13 16:04:29 -0400 |
| commit | 6d153f311c65fe414e31e99f8a9a6503c49a01a5 (patch) | |
| tree | 9173f9964c0fec4215514e622f705810730d0ce9 /engines/kyra/kyra_v2.h | |
| parent | 47c2a9adbe8d9e6640a819386f0f34e929937672 (diff) | |
| parent | 66b43f2312578f35e0718d0699de207a7bf77f1a (diff) | |
| download | scummvm-rg350-6d153f311c65fe414e31e99f8a9a6503c49a01a5.tar.gz scummvm-rg350-6d153f311c65fe414e31e99f8a9a6503c49a01a5.tar.bz2 scummvm-rg350-6d153f311c65fe414e31e99f8a9a6503c49a01a5.zip | |
Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'engines/kyra/kyra_v2.h')
| -rw-r--r-- | engines/kyra/kyra_v2.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/kyra_v2.h index 084b159ee2..9f0aecd78c 100644 --- a/engines/kyra/kyra_v2.h +++ b/engines/kyra/kyra_v2.h @@ -269,6 +269,7 @@ protected: // pathfinder int _movFacingTable[600]; int _pathfinderFlag; + bool _smoothingPath; int findWay(int curX, int curY, int dstX, int dstY, int *moveTable, int moveTableSize); @@ -340,7 +341,7 @@ protected: uint32 _updateCharPosNextUpdate; virtual int getCharacterWalkspeed() const = 0; - virtual void updateCharAnimFrame(int num, int *table) = 0; + virtual void updateCharAnimFrame(int *table) = 0; // chat int _vocHigh; |