diff options
| author | Oystein Eftevaag | 2006-02-11 08:31:13 +0000 |
|---|---|---|
| committer | Oystein Eftevaag | 2006-02-11 08:31:13 +0000 |
| commit | ed7a6e900d3526303ecd9c8017948648aeb25c12 (patch) | |
| tree | 3787c6ebc5652e6db576a88455a5de79f4ee816f /kyra/sprites.cpp | |
| parent | 3a419f8b850ad6479a530a3e912c770099f6ad4e (diff) | |
| download | scummvm-rg350-ed7a6e900d3526303ecd9c8017948648aeb25c12.tar.gz scummvm-rg350-ed7a6e900d3526303ecd9c8017948648aeb25c12.tar.bz2 scummvm-rg350-ed7a6e900d3526303ecd9c8017948648aeb25c12.zip | |
Kyra cleanup path step 2
* Moved more code out of kyra.cpp.
Specifically moved Kyra1 specific sequence helper functions to sequence.cpp
(and updateKyragemFading() from animator.cpp for the same reason),
and some generic animation functions to animator.cpp. This is mainly
in preparation for Kyra2.
* Additionally, cleaned up my last bugfix a little bit :)
svn-id: r20493
Diffstat (limited to 'kyra/sprites.cpp')
| -rw-r--r-- | kyra/sprites.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kyra/sprites.cpp b/kyra/sprites.cpp index 200182c0c8..d1f9d00fd6 100644 --- a/kyra/sprites.cpp +++ b/kyra/sprites.cpp @@ -318,21 +318,21 @@ void Sprites::updateSceneAnims() { data += 2; debug(6, "func: Set Brandon's X coordinate"); debug(6, "X %i", READ_LE_UINT16(data)); - _engine->_currentCharacter->x1 = READ_LE_UINT16(data); + _engine->currentCharacter()->x1 = READ_LE_UINT16(data); data += 2; break; case 0xFFAE: data += 2; debug(6, "func: Set Brandon's Y coordinate"); debug(6, "Y %i", READ_LE_UINT16(data)); - _engine->_currentCharacter->y1 = READ_LE_UINT16(data); + _engine->currentCharacter()->y1 = READ_LE_UINT16(data); data += 2; break; case 0xFFAF: data += 2; debug(6, "func: Set Brandon's sprite"); debug(6, "Sprite %i", READ_LE_UINT16(data)); - _engine->_currentCharacter->currentAnimFrame = READ_LE_UINT16(data); + _engine->currentCharacter()->currentAnimFrame = READ_LE_UINT16(data); data += 2; break; case 0xFFAA: @@ -342,7 +342,7 @@ void Sprites::updateSceneAnims() { case 0xFFAB: data += 2; debug(6, "func: Update Brandon's sprite"); - _engine->animRefreshNPC(0); + _engine->animator()->animRefreshNPC(0); _engine->animator()->flagAllObjectsForRefresh(); _engine->animator()->updateAllObjectShapes(); break; |