aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scumm/script_v6.cpp1
-rw-r--r--scumm/scumm.cpp4
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();