[Scummvm-cvs-logs] scummvm master -> 60b763bd4cc5e8bcbd5638ade0e414ff7c75d2c5

[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:
60b763bd4c SHERLOCK: Fix bug #7084 ("Crash when taking inventory")


Commit: 60b763bd4cc5e8bcbd5638ade0e414ff7c75d2c5
    https://github.com/scummvm/scummvm/commit/60b763bd4cc5e8bcbd5638ade0e414ff7c75d2c5
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2016-03-25T01:40:07+01:00

Commit Message:
SHERLOCK: Fix bug #7084 ("Crash when taking inventory")

This was part regression (ManagedSurface is picky about the order
of the parameters to the line drawing functions), part bug since
it was drawing a horizontal line instead of a vertical.

This call draws a very short vertical line to separate the
rightmost "join" of the middle horizontal bar in the inventory
dialog from the scrollbar. Unless you know what you're looking
for, it's pretty hard to spot the difference.

Thanks to dreammaster for figuring out the proper fix, while I
was still trying to figure out what it was trying to draw.

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



diff --git a/engines/sherlock/tattoo/widget_inventory.cpp b/engines/sherlock/tattoo/widget_inventory.cpp
index 34331f0..9f126cf 100644
--- a/engines/sherlock/tattoo/widget_inventory.cpp
+++ b/engines/sherlock/tattoo/widget_inventory.cpp
@@ -546,7 +546,7 @@ void WidgetInventory::drawBars() {
 		_surface.SHtransBlitFrom(images[7], Common::Point(x - 1, INVENTORY_YSIZE + 2));
 	}
 
-	_surface.hLine(x + 2, INVENTORY_YSIZE + 2, INVENTORY_YSIZE + 8, INFO_BOTTOM);
+	_surface.vLine(x + 2, INVENTORY_YSIZE + 2, INVENTORY_YSIZE + 8, INFO_BOTTOM);
 }
 
 void WidgetInventory::drawInventory() {