[Scummvm-git-logs] scummvm master -> 0411e1cdc58d29e0436498eed9340df769464937

[dreammaster]

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:
0411e1cdc5 TITANIC: Fix incorrect cursor after getting nose


Commit: 0411e1cdc58d29e0436498eed9340df769464937
    https://github.com/scummvm/scummvm/commit/0411e1cdc58d29e0436498eed9340df769464937
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-23T21:56:33-04:00

Commit Message:
TITANIC: Fix incorrect cursor after getting nose

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


diff --git a/engines/titanic/core/drop_target.cpp b/engines/titanic/core/drop_target.cpp
index 51e4751..fa93b72 100644
--- a/engines/titanic/core/drop_target.cpp
+++ b/engines/titanic/core/drop_target.cpp
@@ -150,11 +150,11 @@ bool CDropTarget::EnterViewMsg(CEnterViewMsg *msg) {
 			_cursorId = _dragCursorId;
 		} else if (_clipName.empty()) {
 			loadFrame(_dropFrame);
+			_cursorId = _dropCursorId;
 		} else {
 			playClip(_clipName, _clipFlags);
+			_cursorId = _dropCursorId;
 		}
-
-		_cursorId = _dropCursorId;
 	}
 
 	return true;