From 840a7ee846e0d72309f41b1cf6cf60a478d368f9 Mon Sep 17 00:00:00 2001
From: Travis Howell <kirben@scummvm.org>
Date: Wed, 6 Apr 2005 02:11:07 +0000
Subject: [PATCH] Add correct fix for bug #556496

svn-id: r17406
---
 scumm/script_v6.cpp | 1 +
 scumm/scumm.cpp     | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index 736ebda9bfc..9f7131c666e 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 4410ceb9d85..048d430599e 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();