[Scummvm-git-logs] scummvm master -> 2b010ec6e3a2ca4cdfcb8d4fae6d13ef755337f4

dreammaster dreammaster at scummvm.org
Sun Jul 9 03:44:19 CEST 2017


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f513194d1b TITANIC: Rename CDropTarget _showItem to _hideItem
2b010ec6e3 TITANIC: Fix using hose first on nose


Commit: f513194d1b4e44400c4b6ab1e5e7224f599137f5
    https://github.com/scummvm/scummvm/commit/f513194d1b4e44400c4b6ab1e5e7224f599137f5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-08T21:15:28-04:00

Commit Message:
TITANIC: Rename CDropTarget _showItem to _hideItem

Changed paths:
    engines/titanic/core/drop_target.cpp
    engines/titanic/core/drop_target.h


diff --git a/engines/titanic/core/drop_target.cpp b/engines/titanic/core/drop_target.cpp
index d021705..99d30e4 100644
--- a/engines/titanic/core/drop_target.cpp
+++ b/engines/titanic/core/drop_target.cpp
@@ -34,7 +34,7 @@ BEGIN_MESSAGE_MAP(CDropTarget, CGameObject)
 END_MESSAGE_MAP()
 
 CDropTarget::CDropTarget() : CGameObject(), _itemFrame(0),
-		_itemMatchStartsWith(false), _showItem(false), _dropEnabled(false), _dropFrame(0),
+		_itemMatchStartsWith(false), _hideItem(false), _dropEnabled(false), _dropFrame(0),
 		_dragFrame(0), _dragCursorId(CURSOR_ARROW), _dropCursorId(CURSOR_HAND),
 		_clipFlags(20) {
 }
@@ -46,7 +46,7 @@ void CDropTarget::save(SimpleFile *file, int indent) {
 	file->writeQuotedLine(_itemMatchName, indent);
 	file->writeNumberLine(_itemMatchStartsWith, indent);
 	file->writeQuotedLine(_soundName, indent);
-	file->writeNumberLine(_showItem, indent);
+	file->writeNumberLine(_hideItem, indent);
 	file->writeQuotedLine(_itemName, indent);
 	file->writeNumberLine(_dropEnabled, indent);
 	file->writeNumberLine(_dropFrame, indent);
@@ -66,7 +66,7 @@ void CDropTarget::load(SimpleFile *file) {
 	_itemMatchName = file->readString();
 	_itemMatchStartsWith = file->readNumber();
 	_soundName = file->readString();
-	_showItem = file->readNumber();
+	_hideItem = file->readNumber();
 	_itemName = file->readString();
 	_dropEnabled = file->readNumber();
 	_dropFrame = file->readNumber();
@@ -95,7 +95,7 @@ bool CDropTarget::DropObjectMsg(CDropObjectMsg *msg) {
 	msg->_item->setPosition(Point(_bounds.left, _bounds.top));
 
 	msg->_item->loadFrame(_itemFrame);
-	if (_showItem)
+	if (_hideItem)
 		msg->_item->setVisible(false);
 
 	CDropZoneGotObjectMsg gotMsg(this);
diff --git a/engines/titanic/core/drop_target.h b/engines/titanic/core/drop_target.h
index d77efb4..3536f2a 100644
--- a/engines/titanic/core/drop_target.h
+++ b/engines/titanic/core/drop_target.h
@@ -40,7 +40,7 @@ protected:
 	CString _itemMatchName;
 	bool _itemMatchStartsWith;
 	CString _soundName;
-	bool _showItem;
+	bool _hideItem;
 	CString _itemName;
 	bool _dropEnabled;
 	int _dropFrame;


Commit: 2b010ec6e3a2ca4cdfcb8d4fae6d13ef755337f4
    https://github.com/scummvm/scummvm/commit/2b010ec6e3a2ca4cdfcb8d4fae6d13ef755337f4
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-08T21:44:12-04:00

Commit Message:
TITANIC: Fix using hose first on nose

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


diff --git a/engines/titanic/carry/hose.cpp b/engines/titanic/carry/hose.cpp
index ac7c781..0abbbdc 100644
--- a/engines/titanic/carry/hose.cpp
+++ b/engines/titanic/carry/hose.cpp
@@ -101,7 +101,7 @@ bool CHose::HoseConnectedMsg(CHoseConnectedMsg *msg) {
 	if (msg->_connected) {
 		CHose *hose = dynamic_cast<CHose *>(findChildInstanceOf(CHose::_type));
 		if (hose) {
-			setVisible(true);
+			hose->setVisible(true);
 			hose->petAddToInventory();
 		}
 	}





More information about the Scummvm-git-logs mailing list