diff options
| author | Robert Crossfield | 2016-12-27 10:21:09 +1100 |
|---|---|---|
| committer | Robert Crossfield | 2016-12-27 10:21:09 +1100 |
| commit | 485f26e4d6d60c48529f4b336dee05d7d70a855f (patch) | |
| tree | 5a4f9c4948f4ecde4381505e01b55cbecfd5e993 /engines/scumm | |
| parent | e17fa6216b1b4b145969232fc8b479c1463a1600 (diff) | |
| download | scummvm-rg350-485f26e4d6d60c48529f4b336dee05d7d70a855f.tar.gz scummvm-rg350-485f26e4d6d60c48529f4b336dee05d7d70a855f.tar.bz2 scummvm-rg350-485f26e4d6d60c48529f4b336dee05d7d70a855f.zip | |
SCUMM: Fix bug #4515 (Dr. Fred facing wrong way in lab cutscene)
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/actor.cpp | 5 | ||||
| -rw-r--r-- | engines/scumm/script_v2.cpp | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp index f09729a1ed..8465526243 100644 --- a/engines/scumm/actor.cpp +++ b/engines/scumm/actor.cpp @@ -1510,10 +1510,11 @@ void Actor::putActor(int dstX, int dstY, int newRoom) { ((Actor_v0 *)this)->_newWalkBoxEntered = false; ((Actor_v0 *)this)->_CurrentWalkTo = _pos; ((Actor_v0 *)this)->_NewWalkTo = _pos; + } - // V0 always sets the actor to face the camera upon entering a room + // V0-V1 Maniac always sets the actor to face the camera upon entering a room + if (_vm->_game.id == GID_MANIAC && _vm->_game.version <= 1 && _vm->_game.platform != Common::kPlatformNES) setDirection(oldDirToNewDir(2)); - } } static bool inBoxQuickReject(const BoxCoords &box, int x, int y, int threshold) { diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp index 88c26f8c9e..c58127eedc 100644 --- a/engines/scumm/script_v2.cpp +++ b/engines/scumm/script_v2.cpp @@ -1131,9 +1131,6 @@ void ScummEngine_v2::o2_putActor() { x = getVarOrDirectByte(PARAM_2); y = getVarOrDirectByte(PARAM_3); - if (_game.id == GID_MANIAC && _game.version <= 1 && _game.platform != Common::kPlatformNES) - a->setFacing(180); - a->putActor(x, y); } |