[Scummvm-cvs-logs] scummvm master -> 524f3ad69e00cac923484d0c08f3a10907647d06

[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:
524f3ad69e SHERLOCK: RT: map showCloseUp now partially working


Commit: 524f3ad69e00cac923484d0c08f3a10907647d06
    https://github.com/scummvm/scummvm/commit/524f3ad69e00cac923484d0c08f3a10907647d06
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-11T20:08:25-04:00

Commit Message:
SHERLOCK: RT: map showCloseUp now partially working

Changed paths:
    engines/sherlock/tattoo/tattoo_map.cpp



diff --git a/engines/sherlock/tattoo/tattoo_map.cpp b/engines/sherlock/tattoo/tattoo_map.cpp
index bce07e3..ba8cba9 100644
--- a/engines/sherlock/tattoo/tattoo_map.cpp
+++ b/engines/sherlock/tattoo/tattoo_map.cpp
@@ -508,14 +508,15 @@ void TattooMap::restoreArea(const Common::Rect &bounds) {
 }
 
 void TattooMap::showCloseUp(int closeUpNum) {
+	Events &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
 
 	// Get the closeup images
 	Common::String fname = Common::String::format("res%02d.vgs", closeUpNum + 1);
 	ImageFile pic(fname);
 
-	Common::Point closeUp(_data[closeUpNum].x * 100, _data[closeUpNum].y * 100);
-	Common::Point delta((SHERLOCK_SCREEN_WIDTH / 2 - closeUp.x / 100) * 100 / CLOSEUP_STEPS,
+	Point32 closeUp(_data[closeUpNum].x * 100, _data[closeUpNum].y * 100);
+	Point32 delta((SHERLOCK_SCREEN_WIDTH / 2 - closeUp.x / 100) * 100 / CLOSEUP_STEPS,
 		(SHERLOCK_SCREEN_HEIGHT / 2 - closeUp.y / 100) * 100 / CLOSEUP_STEPS);
 	Common::Rect oldBounds(closeUp.x / 100, closeUp.y / 100, closeUp.x / 100 + 1, closeUp.y / 100 + 1);
 	int size = 64;
@@ -550,13 +551,14 @@ void TattooMap::showCloseUp(int closeUpNum) {
 		restoreArea(oldBounds);
 		screen._backBuffer1.transBlitFrom(pic[0], pt, false, 0, scaleVal);
 
-		// TODO: handle scrolling
-		screen.slamRect(_oldTextBounds);
+		screen.slamRect(oldBounds);
 		screen.slamArea(pt.x, pt.y, picSize.x, picSize.y);
 
 		oldBounds = Common::Rect(pt.x, pt.y, pt.x + picSize.x + 1, pt.y + picSize.y + 1);
 		closeUp += delta;
 		scaleVal += deltaScale;
+
+		events.wait(1);
 	}
 
 	// Handle final drawing of closeup