[Scummvm-git-logs] scummvm master -> 6544c512626e851a429f64d99f64f4bb4d17e368

dreammaster dreammaster at scummvm.org
Sun Dec 18 21:50:25 CET 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:
6544c51262 TITANIC: Fix crash dragging items from inventory


Commit: 6544c512626e851a429f64d99f64f4bb4d17e368
    https://github.com/scummvm/scummvm/commit/6544c512626e851a429f64d99f64f4bb4d17e368
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-18T15:50:23-05:00

Commit Message:
TITANIC: Fix crash dragging items from inventory

Changed paths:
    engines/titanic/pet_control/pet_inventory_glyphs.cpp


diff --git a/engines/titanic/pet_control/pet_inventory_glyphs.cpp b/engines/titanic/pet_control/pet_inventory_glyphs.cpp
index d7918cf..75b1fc9 100644
--- a/engines/titanic/pet_control/pet_inventory_glyphs.cpp
+++ b/engines/titanic/pet_control/pet_inventory_glyphs.cpp
@@ -138,7 +138,7 @@ bool CPetInventoryGlyph::dragGlyph(const Point &topLeft, CMouseDragStartMsg *msg
 		petControl->setAreaChangeType(1);
 		return true;
 	} else {
-		petControl->addToInventory(carryParcel);
+		petControl->addToInventory(item);
 		return false;
 	}
 }





More information about the Scummvm-git-logs mailing list