[Scummvm-cvs-logs] scummvm master -> 650c455e8525a8b294e966e7cc7a31a3f127a2dd

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
650c455e85 SHERLOCK: RT: Fix setting default _lookPos in scrolled scenes


Commit: 650c455e8525a8b294e966e7cc7a31a3f127a2dd
    https://github.com/scummvm/scummvm/commit/650c455e8525a8b294e966e7cc7a31a3f127a2dd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-01T16:03:01-04:00

Commit Message:
SHERLOCK: RT: Fix setting default _lookPos in scrolled scenes

Changed paths:
    engines/sherlock/tattoo/tattoo_people.cpp
    engines/sherlock/tattoo/tattoo_user_interface.cpp



diff --git a/engines/sherlock/tattoo/tattoo_people.cpp b/engines/sherlock/tattoo/tattoo_people.cpp
index cc5872e..31aa333 100644
--- a/engines/sherlock/tattoo/tattoo_people.cpp
+++ b/engines/sherlock/tattoo/tattoo_people.cpp
@@ -1119,6 +1119,9 @@ void TattooPerson::centerScreenOnPerson() {
 	ui._targetScroll.x = CLIP(_position.x / FIXED_INT_MULTIPLIER - SHERLOCK_SCREEN_WIDTH / 2,
 		0, screen._backBuffer1.w() - SHERLOCK_SCREEN_WIDTH);
 	screen._currentScroll = ui._targetScroll;
+
+	// Reset the default look position to the center of the screen
+	ui._lookPos = screen._currentScroll + Common::Point(SHERLOCK_SCREEN_WIDTH / 2, SHERLOCK_SCREEN_HEIGHT / 2);
 }
 
 /*----------------------------------------------------------------*/
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp
index 36f00f3..5b56c94 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.cpp
+++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp
@@ -362,6 +362,9 @@ void TattooUserInterface::doScroll() {
 		if (screen._currentScroll.x < _targetScroll.x)
 			screen._currentScroll.x = _targetScroll.x;
 	}
+
+	// Reset the default look position to the center of the new screen area
+	_lookPos = screen._currentScroll + Common::Point(SHERLOCK_SCREEN_WIDTH / 2, SHERLOCK_SCREEN_HEIGHT / 2);
 }
 
 void TattooUserInterface::doStandardControl() {