diff options
| author | Paul Gilbert | 2015-06-14 08:56:00 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-06-14 08:56:00 -0400 |
| commit | 5364b46d6ac2a0907d864ec1aa60cd4835f4d1dc (patch) | |
| tree | 5584c3478f619b0532a9d8be46cce33af6f32151 /engines/sherlock/scalpel/scalpel_scene.cpp | |
| parent | a33a4fa591cdcf35e377de84383047d819f1ecc9 (diff) | |
| download | scummvm-rg350-5364b46d6ac2a0907d864ec1aa60cd4835f4d1dc.tar.gz scummvm-rg350-5364b46d6ac2a0907d864ec1aa60cd4835f4d1dc.tar.bz2 scummvm-rg350-5364b46d6ac2a0907d864ec1aa60cd4835f4d1dc.zip | |
SHERLOCK: RT: Move checkObject from Object to BaseObject
checkObject needs to be called in checkSprite now, which is in
the Sprite class. So the method and a few others it depeends
on have been moved into BaseObject
Diffstat (limited to 'engines/sherlock/scalpel/scalpel_scene.cpp')
| -rw-r--r-- | engines/sherlock/scalpel/scalpel_scene.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sherlock/scalpel/scalpel_scene.cpp b/engines/sherlock/scalpel/scalpel_scene.cpp index 723939211a..af7090332c 100644 --- a/engines/sherlock/scalpel/scalpel_scene.cpp +++ b/engines/sherlock/scalpel/scalpel_scene.cpp @@ -598,7 +598,7 @@ int ScalpelScene::startCAnim(int cAnimNum, int playRate) { ++frames; } else { // Forward direction - Object::_countCAnimFrames = true; + BaseObject::_countCAnimFrames = true; while (cObj._type == ACTIVE_BG_SHAPE) { cObj.checkObject(); @@ -611,7 +611,7 @@ int ScalpelScene::startCAnim(int cAnimNum, int playRate) { if (frames > 1) --frames; - Object::_countCAnimFrames = false; + BaseObject::_countCAnimFrames = false; cObj._type = cAnim._type; cObj._frameNumber = -1; |