Moved mouse cursor code into ScummEngine subclasses were possible -- this makes it much easier to see which cursor code is used in which SCUMM version; also changed cursor code to not overwrite default_cursor_* (which would cause problems when switching to another game)

svn-id: r15169

1 files changed, 8 insertions, 8 deletions

diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 3094a215f4..fdb42985fd 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -1346,12 +1346,6 @@ void ScummEngine::scummInit() {
 		_flashlight.buffer = NULL;
 	}
 
-	// HACK cursor hotspot is wrong
-	// Original games used 
-	// setCursorHotspot(8, 7);
-	if (_gameId == GID_FUNPACK)
-		setCursorHotspot(16, 16);
-
 	_mouse.x = 104;
 	_mouse.y = 56;
 
@@ -1422,6 +1416,12 @@ void ScummEngine_v6::scummInit() {
 		setCursorFromImg(697, 60, 1);
 		setCursorTransparency(1);
 	}
+
+	// HACK cursor hotspot is wrong
+	// Original games used 
+	// setCursorHotspot(8, 7);
+	if (_gameId == GID_FUNPACK)
+		setCursorHotspot(16, 16);
 }
 
 void ScummEngine::initScummVars() {
@@ -2332,8 +2332,8 @@ void ScummEngine::startScene(int room, Actor *a, int objectNr) {
 
 		for (int y = 0; y < vs->h; y++) {
 			memcpy(dst, src, vs->w);
-			src += vs->w;
-			dst += vs->pitch;
+			src += vs->pitch;
+			dst += vs->w;
 		}
 	}