[Scummvm-cvs-logs] scummvm master -> 64709482e6ff259fa0b42ba379106158b7d8e318

[eriktorbjorn]

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:
64709482e6 SHERLOCK: Fix crash when searching the Serrated Scalpel journal


Commit: 64709482e6ff259fa0b42ba379106158b7d8e318
    https://github.com/scummvm/scummvm/commit/64709482e6ff259fa0b42ba379106158b7d8e318
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2016-04-09T09:33:17+02:00

Commit Message:
SHERLOCK: Fix crash when searching the Serrated Scalpel journal

As far as I can tell, the lines I removed to draw the search box
are already handled by the call to makeField() above. Also, they
were drawing to the wrong surface, and one of them was in the
wrong direction, which is what triggered an assertion.

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



diff --git a/engines/sherlock/scalpel/scalpel_journal.cpp b/engines/sherlock/scalpel/scalpel_journal.cpp
index d6f8021..151d986 100644
--- a/engines/sherlock/scalpel/scalpel_journal.cpp
+++ b/engines/sherlock/scalpel/scalpel_journal.cpp
@@ -485,11 +485,6 @@ int ScalpelJournal::getSearchString(bool printError) {
 
 	screen.makeField(Common::Rect(12, 185, 307, 196));
 
-	screen.fillRect(Common::Rect(12, 185, 307, 186), BUTTON_BOTTOM);
-	screen.vLine(12, 185, 195, BUTTON_BOTTOM);
-	screen.hLine(13, 195, 306, BUTTON_TOP);
-	screen.hLine(306, 186, 195, BUTTON_TOP);
-
 	if (printError) {
 		screen.gPrint(Common::Point((SHERLOCK_SCREEN_WIDTH - screen.stringWidth(_fixedTextSearchNotFound)) / 2, 185),
 			INV_FOREGROUND, "%s", _fixedTextSearchNotFound.c_str());