[Scummvm-cvs-logs] scummvm master -> e4aef79e95f80706df062402518af9cc4c68f95e

[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:
e4aef79e95 SHERLOCK: 3DO: Tweak clipping to keep portrait videos on-screen


Commit: e4aef79e95f80706df062402518af9cc4c68f95e
    https://github.com/scummvm/scummvm/commit/e4aef79e95f80706df062402518af9cc4c68f95e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-09-12T17:42:17-04:00

Commit Message:
SHERLOCK: 3DO: Tweak clipping to keep portrait videos on-screen

Changed paths:
    engines/sherlock/scalpel/scalpel_talk.cpp



diff --git a/engines/sherlock/scalpel/scalpel_talk.cpp b/engines/sherlock/scalpel/scalpel_talk.cpp
index 2dca5a5..88a718e 100644
--- a/engines/sherlock/scalpel/scalpel_talk.cpp
+++ b/engines/sherlock/scalpel/scalpel_talk.cpp
@@ -673,8 +673,8 @@ Common::Point ScalpelTalk::get3doPortraitPosition() const {
 	// Adjust the top-left so the center of the portrait will be on the character,
 	// but ensure the portrait will be entirely on-screen
 	pt -= Common::Point(PORTRAIT_W / 2, PORTRAIT_H / 2);
-	pt.x = CLIP((int)pt.x, 20, SHERLOCK_SCREEN_WIDTH - 20 - PORTRAIT_W);
-	pt.y = CLIP((int)pt.y, 20, SHERLOCK_SCREEN_HEIGHT - 20 - PORTRAIT_H);
+	pt.x = CLIP((int)pt.x, 10, SHERLOCK_SCREEN_WIDTH - 10 - PORTRAIT_W);
+	pt.y = CLIP((int)pt.y, 10, CONTROLS_Y - PORTRAIT_H - 10);
 
 	return pt;
 }