[Scummvm-git-logs] scummvm master -> 7519b368f55f86849a417eadf2d1af7cdbc81c41

dreammaster dreammaster at scummvm.org
Sat Dec 3 01:28:47 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:
7519b368f5 TITANIC: Fix dragging magazine to inventory


Commit: 7519b368f55f86849a417eadf2d1af7cdbc81c41
    https://github.com/scummvm/scummvm/commit/7519b368f55f86849a417eadf2d1af7cdbc81c41
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-02T19:28:31-05:00

Commit Message:
TITANIC: Fix dragging magazine to inventory

Changed paths:
    engines/titanic/messages/mouse_messages.h
    engines/titanic/npcs/succubus.cpp


diff --git a/engines/titanic/messages/mouse_messages.h b/engines/titanic/messages/mouse_messages.h
index 05f9685..a610d77 100644
--- a/engines/titanic/messages/mouse_messages.h
+++ b/engines/titanic/messages/mouse_messages.h
@@ -170,7 +170,7 @@ public:
 	int _value4;
 public:
 	CLASSDEF;
-	CPassOnDragStartMsg() : CMessage() {}
+	CPassOnDragStartMsg() : CMessage(), _value3(0), _value4(0) {}
 	CPassOnDragStartMsg(const Point &pt, int v3 = 0, int v4 = 0) :
 		CMessage(), _mousePos(pt), _value3(v3), _value4(v4) {}
 
diff --git a/engines/titanic/npcs/succubus.cpp b/engines/titanic/npcs/succubus.cpp
index 956f2ca..af859f9 100644
--- a/engines/titanic/npcs/succubus.cpp
+++ b/engines/titanic/npcs/succubus.cpp
@@ -610,6 +610,7 @@ bool CSuccUBus::MovieEndMsg(CMovieEndMsg *msg) {
 	}
 
 	if (msg->_endFrame == _endFrame4) {
+		// SuccUBus disgorged mail
 		if (pet && _mailP) {
 			_mailP->setMailDest(petRoomFlags);
 		}





More information about the Scummvm-git-logs mailing list