diff options
| author | segrax | 2012-01-20 07:47:43 +1100 |
|---|---|---|
| committer | Tobias Gunkel | 2012-02-11 08:29:00 +0100 |
| commit | e331421eae305fe857c1b630d5764e35635eaa7e (patch) | |
| tree | 15af6171e54323084692934b694750b7aaf1782c /engines | |
| parent | e2d45467bb6f0dc6d35fa33697bb97ae470f05f1 (diff) | |
| download | scummvm-rg350-e331421eae305fe857c1b630d5764e35635eaa7e.tar.gz scummvm-rg350-e331421eae305fe857c1b630d5764e35635eaa7e.tar.bz2 scummvm-rg350-e331421eae305fe857c1b630d5764e35635eaa7e.zip | |
SCUMM: Save the new variables, move the setting of the unknown variable to after the setDirection call
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/actor.cpp | 12 | ||||
| -rw-r--r-- | engines/scumm/saveload.h | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp index c4b7c82a57..17e1f8cd82 100644 --- a/engines/scumm/actor.cpp +++ b/engines/scumm/actor.cpp @@ -865,9 +865,6 @@ void Actor::setDirection(int direction) { else _vm->_costumeLoader->costumeDecodeData(this, _standFrame, 0); - // 0x2C17 - ((ActorC64*) this)->_byte_FD0A = -1; - _needRedraw = true; return; } @@ -901,6 +898,7 @@ void Actor::turnToDirection(int newdir) { if (newdir == -1 || _ignoreTurns) return; + // 0x2C17 if( _vm->_game.version == 0 ) ((ActorC64*) this)->_byte_FD0A = -1; @@ -2655,7 +2653,6 @@ void ActorC64::animateActor(int anim) { if( this->isInCurrentRoom() ) { // this->_costCommandNew = anim; - this->_byte_FD0A = this->_byte_FDE8; // 0x273A /*switch( anim ) { @@ -2675,9 +2672,11 @@ void ActorC64::animateActor(int anim) { default: return; }*/ - + this->setDirection( dir ); + this->_byte_FD0A = this->_byte_FDE8; + } else { if( anim > 4 ) { @@ -2696,6 +2695,9 @@ void ActorC64::saveLoadWithSerializer(Serializer *ser) { MKLINE(ActorC64, _miscflags, sleByte, VER(84)), MKLINE(ActorC64, _speaking, sleByte, VER(84)), MKLINE(ActorC64, _speakingPrev, sleByte, VER(84)), + MKLINE(ActorC64, _byte_FD0A, sleByte, VER(89)), + MKLINE(ActorC64, _byte_FDE8, sleByte, VER(89)), + MKARRAY(ActorC64, _byte_FCE2, sleInt8, 8, VER(89)), MKEND() }; diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h index 064bdf1406..898f80f867 100644 --- a/engines/scumm/saveload.h +++ b/engines/scumm/saveload.h @@ -47,7 +47,7 @@ namespace Scumm { * only saves/loads those which are valid for the version of the savegame * which is being loaded/saved currently. */ -#define CURRENT_VER 88 +#define CURRENT_VER 89 /** * An auxillary macro, used to specify savegame versions. We use this instead |