Ticket #8219: dig-camera-hack.diff

scummvm/scumm/gfx.cpp

@@ -1958 +1958 @@
                 clampCameraPos(&camera._cur);
 
                 camera._dest = camera._cur;
+                _vars[VAR_CAMERA_DEST_X] = camera._dest.x;
+                _vars[VAR_CAMERA_DEST_Y] = camera._dest.y;
 
                 assert(camera._cur.x >= (_realWidth / 2) && camera._cur.y >= (_realHeight / 2));
 
@@ -1996 +1998 @@
                 int ax, ay;
 
                 camera._follows = a->number;
+                _vars[VAR_CAMERA_FOLLOWED_ACTOR] = a->number;
 
                 if (!a->isInCurrentRoom()) {
                         startScene(a->getRoom(), 0, 0);
@@ -2072 +2075 @@
                 }
 
                 if (camera._movingToActor) {
-                        camera._dest.x = a->x;
-                        camera._dest.y = a->y;
+                        _vars[VAR_CAMERA_DEST_X] = camera._dest.x = a->x;
+                        _vars[VAR_CAMERA_DEST_Y] = camera._dest.y = a->y;
                 }
 
                 assert(camera._cur.x >= (_realWidth / 2) && camera._cur.y >= (_realHeight / 2));
@@ -2131 +2134 @@
                         _vars[VAR_CAMERA_POS_X] = camera._cur.x;
                         _vars[VAR_CAMERA_POS_Y] = camera._cur.y;
 
-                        _vars[VAR_CAMERA_DEST_X] = camera._dest.x;
-
-                        _vars[VAR_CAMERA_DEST_Y] = camera._dest.y;
-
-                        _vars[VAR_CAMERA_FOLLOWED_ACTOR] = camera._follows;
-
                         if (_vars[VAR_SCROLL_SCRIPT])
                                 runScript(_vars[VAR_SCROLL_SCRIPT], 0, 0, 0);
                 }
@@ -2252 +2249 @@
 void Scumm::panCameraTo(int x, int y) {
         if (_features & GF_AFTER_V7) {
 
-                camera._follows = 0;
-                camera._dest.x = x;
-                camera._dest.y = y;
+                _vars[VAR_CAMERA_FOLLOWED_ACTOR] = camera._follows = 0;
+                _vars[VAR_CAMERA_DEST_X] = camera._dest.x = x;
+                _vars[VAR_CAMERA_DEST_Y] = camera._dest.y = y;
         } else {
 
                 camera._dest.x = x;

scummvm/scumm/script_v5.cpp

@@ -1348 +1348 @@
         startScene(a->room, a, obj);
         _vars[VAR_WALKTO_OBJ] = 0;
 
-        camera._dest.x = camera._cur.x = a->x;
+        // FIXME: Can this be removed?
+        camera._cur.x = a->x;
+
         setCameraAt(a->x, a->y);
         setCameraFollows(a);
 

scummvm/scumm/script_v6.cpp

@@ -953 +953 @@
                 int x, y;
 
                 camera._follows = 0;
+                _vars[VAR_CAMERA_FOLLOWED_ACTOR] = 0;
 
                 y = pop();
                 x = pop();