[Scummvm-git-logs] scummvm master -> 8f8b2ed003f9ba998ab4717fad533a2bc8ae1369

sev- sev at scummvm.org
Fri Dec 1 20:01:04 CET 2017


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:
8f8b2ed003 FULLPIPE: Fix bug #9672: "Several inventory items highlighted at the same time"


Commit: 8f8b2ed003f9ba998ab4717fad533a2bc8ae1369
    https://github.com/scummvm/scummvm/commit/8f8b2ed003f9ba998ab4717fad533a2bc8ae1369
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-12-01T19:58:11+01:00

Commit Message:
FULLPIPE: Fix bug #9672: "Several inventory items highlighted at the same time"

Changed paths:
    engines/fullpipe/inventory.cpp


diff --git a/engines/fullpipe/inventory.cpp b/engines/fullpipe/inventory.cpp
index 1a3c234..bba1284 100644
--- a/engines/fullpipe/inventory.cpp
+++ b/engines/fullpipe/inventory.cpp
@@ -465,6 +465,8 @@ int Inventory2::getHoveredItem(Common::Point *point) {
 	if (!_isInventoryOut)
 		return 0;
 
+	int res = 0;
+
 	for (uint i = 0; i < _inventoryIcons.size(); i++) {
 		InventoryIcon &icn = _inventoryIcons[i];
 		if (selId ||
@@ -475,11 +477,11 @@ int Inventory2::getHoveredItem(Common::Point *point) {
 			icn.isMouseHover = false;
 		} else {
 			icn.isMouseHover = true;
-			return icn.inventoryItemId;
+			res = icn.inventoryItemId;
 		}
 	}
 
-	return 0;
+	return res;
 }
 
 void Inventory2::clear() {





More information about the Scummvm-git-logs mailing list