TITANIC: Fix dragging feather on nose holder

2 files changed, 9 insertions, 10 deletions

diff --git a/engines/titanic/game/nose_holder.cpp b/engines/titanic/game/nose_holder.cpp
index ac6c10dafd..6882e4f56d 100644
--- a/engines/titanic/game/nose_holder.cpp
+++ b/engines/titanic/game/nose_holder.cpp
@@ -33,19 +33,19 @@ BEGIN_MESSAGE_MAP(CNoseHolder, CDropTarget)
 END_MESSAGE_MAP()
 
 CNoseHolder::CNoseHolder() : CDropTarget(), _dragObject(nullptr),
-		_field11C(0) {
+		_draggingFeather(false) {
 }
 
 void CNoseHolder::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(1, indent);
-	file->writeNumberLine(_field11C, indent);
+	file->writeNumberLine(_draggingFeather, indent);
 
 	CDropTarget::save(file, indent);
 }
 
 void CNoseHolder::load(SimpleFile *file) {
 	file->readNumber();
-	_field11C = file->readNumber();
+	_draggingFeather = file->readNumber();
 
 	CDropTarget::load(file);
 }
@@ -78,13 +78,12 @@ bool CNoseHolder::FrameMsg(CFrameMsg *msg) {
 	}
 
 	if (_dragObject) {
-		if (!checkPoint(Point(_dragObject->_bounds.left,
-				_dragObject->_bounds.top))) {
-			_field11C = false;
-		} else if (!_field11C) {
+		if (!checkPoint(Point(_dragObject->_bounds.left, _dragObject->_bounds.top), true)) {
+			_draggingFeather = false;
+		} else if (!_draggingFeather) {
 			CActMsg actMsg("Sneeze");
 			actMsg.execute(this);
-			_field11C = true;
+			_draggingFeather = true;
 		}
 	}
 
@@ -92,7 +91,7 @@ bool CNoseHolder::FrameMsg(CFrameMsg *msg) {
 }
 
 bool CNoseHolder::LeaveViewMsg(CLeaveViewMsg *msg) {
-	_field11C = false;
+	_draggingFeather = false;
 	_dragObject = nullptr;
 	if (_fieldF4) {
 		loadFrame(_dropFrame);
diff --git a/engines/titanic/game/nose_holder.h b/engines/titanic/game/nose_holder.h
index 7b3fbba625..ef20b6f78e 100644
--- a/engines/titanic/game/nose_holder.h
+++ b/engines/titanic/game/nose_holder.h
@@ -36,7 +36,7 @@ class CNoseHolder : public CDropTarget {
 	bool EnterViewMsg(CEnterViewMsg *msg);
 private:
 	CGameObject *_dragObject;
-	int _field11C;
+	bool _draggingFeather;
 public:
 	CLASSDEF;
 	CNoseHolder();