diff options
| author | Travis Howell | 2005-04-06 02:11:07 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-04-06 02:11:07 +0000 |
| commit | 840a7ee846e0d72309f41b1cf6cf60a478d368f9 (patch) | |
| tree | 466be7a9f2151181f893976106edd66cb996781b | |
| parent | 21c2c603435bbd89d822352be45e0682893e53cd (diff) | |
| download | scummvm-rg350-840a7ee846e0d72309f41b1cf6cf60a478d368f9.tar.gz scummvm-rg350-840a7ee846e0d72309f41b1cf6cf60a478d368f9.tar.bz2 scummvm-rg350-840a7ee846e0d72309f41b1cf6cf60a478d368f9.zip | |
Add correct fix for bug #556496
svn-id: r17406
| -rw-r--r-- | scumm/script_v6.cpp | 1 | ||||
| -rw-r--r-- | scumm/scumm.cpp | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 736ebda9bf..9f7131c666 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -1340,6 +1340,7 @@ void ScummEngine_v6::o6_loadRoomWithEgo() { VAR(VAR_WALKTO_OBJ) = 0; if (_version == 6) { + camera._cur.x = camera._dest.x = a->_pos.x; setCameraFollows(a); } diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 4410ceb9d8..048d430599 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -2255,6 +2255,10 @@ void ScummEngine::startScene(int room, Actor *a, int objectNr) { a->putActor(x, y, _currentRoom); a->setDirection(dir + 180); a->stopActorMoving(); + if (_gameId == GID_SAMNMAX) { + camera._cur.x = camera._dest.x = a->_pos.x; + setCameraAt(a->_pos.x, a->_pos.y); + } } showActors(); |