thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCUMM: Fix bug #4515 (Dr. Fred facing wrong way in lab cutscene)

Browse source
This commit is contained in:
Robert Crossfield 2016-12-27 10:21:09 +11:00
parent e17fa6216b
commit 485f26e4d6
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
engines/scumm/actor.cpp
View file

@ -1510,10 +1510,11 @@ void Actor::putActor(int dstX, int dstY, int newRoom) {
((Actor_v0 *)this)->_newWalkBoxEntered = false; ((Actor_v0 *)this)->_newWalkBoxEntered = false;
((Actor_v0 *)this)->_CurrentWalkTo = _pos; ((Actor_v0 *)this)->_CurrentWalkTo = _pos;
((Actor_v0 *)this)->_NewWalkTo = _pos; ((Actor_v0 *)this)->_NewWalkTo = _pos;
// V0 always sets the actor to face the camera upon entering a room
setDirection(oldDirToNewDir(2));
} }
// 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) { static bool inBoxQuickReject(const BoxCoords &box, int x, int y, int threshold) {

3
engines/scumm/script_v2.cpp
View file

@ -1131,9 +1131,6 @@ void ScummEngine_v2::o2_putActor() {
x = getVarOrDirectByte(PARAM_2); x = getVarOrDirectByte(PARAM_2);
y = getVarOrDirectByte(PARAM_3); y = getVarOrDirectByte(PARAM_3);
if (_game.id == GID_MANIAC && _game.version <= 1 && _game.platform != Common::kPlatformNES)
a->setFacing(180);
a->putActor(x, y); a->putActor(x, y);
} }