aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorRobert Crossfield2012-01-28 00:38:19 +1100
committerTobias Gunkel2012-02-11 08:29:37 +0100
commitfb3e431ec63cbdd2edc7e289b0910cfe4aa72510 (patch)
treec168f0bbd5fca86fedbf99bcba459da1675b577d /engines/scumm
parent5accf01881424e10e1700bf36c4b8236ed200258 (diff)
downloadscummvm-rg350-fb3e431ec63cbdd2edc7e289b0910cfe4aa72510.tar.gz
scummvm-rg350-fb3e431ec63cbdd2edc7e289b0910cfe4aa72510.tar.bz2
scummvm-rg350-fb3e431ec63cbdd2edc7e289b0910cfe4aa72510.zip
SCUMM: V0 always turns actor towards camera when entering room, remove unnecessary loadcostume
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/actor.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 95b7f90318..e95b3555eb 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -999,6 +999,10 @@ void Actor::putActor(int dstX, int dstY, int newRoom) {
if (isInCurrentRoom())
showActor();
}
+
+ // V0 always sets the actor to face the camera upon entering a room
+ if( _vm->_game.version == 0 )
+ setDirection( oldDirToNewDir(2));
}
static bool inBoxQuickReject(const BoxCoords &box, int x, int y, int threshold) {
@@ -1943,8 +1947,6 @@ void ActorC64::limbFrameCheck() {
_limbFrameRepeat[_limb_current] = _limbFrameRepeatNew[_limb_current];
- _vm->_costumeLoader->loadCostume(_costume);
-
// 0x25C3
_cost.active[_limb_current] = ((C64CostumeLoader*)_vm->_costumeLoader)->getFrame( this );
_cost.curpos[_limb_current] = 0;