diff options
Diffstat (limited to 'engines/sherlock/scene.cpp')
| -rw-r--r-- | engines/sherlock/scene.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp index 3d406fe134..c948baa176 100644 --- a/engines/sherlock/scene.cpp +++ b/engines/sherlock/scene.cpp @@ -116,7 +116,7 @@ void Exit::load(Common::SeekableReadStream &s, bool isRoseTattoo) { _newPosition.x = s.readSint16LE(); _newPosition.y = s.readSint16LE(); - _newFacing = s.readUint16LE(); + _newPosition._facing = s.readUint16LE(); if (isRoseTattoo) _allow = s.readSint16LE(); @@ -135,7 +135,7 @@ void Exit::load3DO(Common::SeekableReadStream &s) { _newPosition.x = s.readSint16BE(); _newPosition.y = s.readSint16BE(); - _newFacing = s.readUint16BE(); + _newPosition._facing = s.readUint16BE(); s.skip(2); // Filler } @@ -231,7 +231,6 @@ Scene::Scene(SherlockEngine *vm): _vm(vm) { _animating = 0; _doBgAnimDone = true; _tempFadeStyle = 0; - _exitZone = -1; _doBgAnimDone = false; } @@ -603,7 +602,6 @@ bool Scene::loadScene(const Common::String &filename) { } // Read in the exits - _exitZone = -1; int numExits = rrmStream->readByte(); _exits.resize(numExits); @@ -922,7 +920,6 @@ bool Scene::loadScene(const Common::String &filename) { int exitsCount = header3DO_exits_size / 20; - _exitZone = -1; _exits.resize(exitsCount); for (int idx = 0; idx < exitsCount; ++idx) _exits[idx].load3DO(*roomStream); @@ -1157,8 +1154,8 @@ void Scene::transitionToScene() { SaveManager &saves = *_vm->_saves; Screen &screen = *_vm->_screen; Talk &talk = *_vm->_talk; - Point32 &hSavedPos = people._hSavedPos; - int &hSavedFacing = people._hSavedFacing; + Point32 &hSavedPos = people._savedPos; + int &hSavedFacing = people._savedPos._facing; if (hSavedPos.x < 1) { // No exit information from last scene-check entrance info |