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/saveload.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/saveload.cpp')
-rw-r--r-- | kyra/saveload.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kyra/saveload.cpp b/kyra/saveload.cpp index 8a297eda77..fcc6dbfe66 100644 --- a/kyra/saveload.cpp +++ b/kyra/saveload.cpp @@ -128,7 +128,7 @@ void KyraEngine::loadGame(const char *fileName) { in->read(_brandonPoisonFlagsGFX, 256); _brandonInvFlag = in->readSint16BE(); _poisonDeathCounter = in->readByte(); - _brandonDrawFrame = in->readUint16BE(); + _animator->_brandonDrawFrame = in->readUint16BE(); for (int i = 0; i < 32; i++) { _timers[i].active = in->readByte(); @@ -193,14 +193,14 @@ void KyraEngine::loadGame(const char *fileName) { } createMouseItem(_itemInHand); - setBrandonAnimSeqSize(5, 48); + _animator->setBrandonAnimSeqSize(5, 48); _animator->_noDrawShapesFlag = 1; enterNewScene(_currentCharacter->sceneId, _currentCharacter->facing, 0, 0, 1); _animator->_noDrawShapesFlag = 0; _currentCharacter->x1 = brandonX; _currentCharacter->y1 = brandonY; - animRefreshNPC(0); + _animator->animRefreshNPC(0); _animator->restoreAllObjectBackgrounds(); _animator->preserveAnyChangedBackgrounds(); _animator->prepDrawAllObjects(); @@ -276,7 +276,7 @@ void KyraEngine::saveGame(const char *fileName, const char *saveName) { out->write(_brandonPoisonFlagsGFX, 256); out->writeSint16BE(_brandonInvFlag); out->writeByte(_poisonDeathCounter); - out->writeUint16BE(_brandonDrawFrame); + out->writeUint16BE(_animator->_brandonDrawFrame); for (int i = 0; i < 32; i++) { out->writeByte(_timers[i].active); |