[Scummvm-git-logs] scummvm master -> 6c54d5e0206a7ec28d6661bfed8da8602aae755b

dreammaster dreammaster at scummvm.org
Wed Oct 26 01:50:52 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:
6c54d5e020 TITANIC: Fix dragging Photograph


Commit: 6c54d5e0206a7ec28d6661bfed8da8602aae755b
    https://github.com/scummvm/scummvm/commit/6c54d5e0206a7ec28d6661bfed8da8602aae755b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-10-25T19:50:45-04:00

Commit Message:
TITANIC: Fix dragging Photograph

Changed paths:
    engines/titanic/carry/carry.cpp



diff --git a/engines/titanic/carry/carry.cpp b/engines/titanic/carry/carry.cpp
index 03798e8..90e35c8 100644
--- a/engines/titanic/carry/carry.cpp
+++ b/engines/titanic/carry/carry.cpp
@@ -100,16 +100,16 @@ bool CCarry::MouseDragStartMsg(CMouseDragStartMsg *msg) {
 	CString name = getName();
 
 	if (_fieldE0) {
-		if (_visible) {
-			CShowTextMsg textMsg("You can't get this.");
-			textMsg.execute("PET");
-		}
-	} else {
 		if (checkStartDragging(msg)) {
 			CPassOnDragStartMsg startMsg(msg->_mousePos);
 			startMsg.execute(this);
 			return true;
 		}
+	} else {
+		if (_visible) {
+			CShowTextMsg textMsg("You can't get this.");
+			textMsg.execute("PET");
+		}
 	}
 
 	return false;





More information about the Scummvm-git-logs mailing list