[Scummvm-cvs-logs] scummvm master -> 0d1bfecebc9fd0d050abed493cdb8989bc23c1b8

eriktorbjorn eriktorbjorn at telia.com
Fri Apr 8 22:53:08 CEST 2016


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:
0d1bfecebc SHERLOCK: Fix crash when searching journal in Rose Tattoo


Commit: 0d1bfecebc9fd0d050abed493cdb8989bc23c1b8
    https://github.com/scummvm/scummvm/commit/0d1bfecebc9fd0d050abed493cdb8989bc23c1b8
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2016-04-08T22:52:59+02:00

Commit Message:
SHERLOCK: Fix crash when searching journal in Rose Tattoo

Another part bug, part regression from using ManagedSurface, I
guess.

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



diff --git a/engines/sherlock/tattoo/tattoo_journal.cpp b/engines/sherlock/tattoo/tattoo_journal.cpp
index 918887f..0d5c26d 100644
--- a/engines/sherlock/tattoo/tattoo_journal.cpp
+++ b/engines/sherlock/tattoo/tattoo_journal.cpp
@@ -523,15 +523,14 @@ void TattooJournal::drawControls(int mode) {
 
 	if (mode != 2) {
 		// Draw the Bars separating the Journal Commands
-		int xp = r.right / 3;
+		int xp = r.left + r.width() / 3;
 		for (int idx = 0; idx < 2; ++idx) {
 			screen._backBuffer1.SHtransBlitFrom(images[6], Common::Point(xp - 2, r.top + 1));
 			screen._backBuffer1.SHtransBlitFrom(images[7], Common::Point(xp - 2, yp - 1));
 
-			screen._backBuffer1.hLine(xp - 1, r.top + 4, yp - 2, INFO_TOP);
-			screen._backBuffer1.hLine(xp, r.top + 4, yp - 2, INFO_MIDDLE);
-			screen._backBuffer1.hLine(xp + 1, r.top + 4, yp - 2, INFO_BOTTOM);
-			xp = r.right / 3 * 2;
+			screen._backBuffer1.vLine(xp - 1, r.top + 4, yp - 2, INFO_TOP);			screen._backBuffer1.vLine(xp, r.top + 4, yp - 2, INFO_MIDDLE);
+			screen._backBuffer1.vLine(xp + 1, r.top + 4, yp - 2, INFO_BOTTOM);
+			xp += r.width() / 3;
 		}
 	}
 






More information about the Scummvm-git-logs mailing list