[Scummvm-git-logs] scummvm master -> 97a39f6a58bea450cfa5312f16f2889ddba7c7aa

[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:
97a39f6a58 TITANIC: Fix movement cursors in Lift 4 when eye is removed


Commit: 97a39f6a58bea450cfa5312f16f2889ddba7c7aa
    https://github.com/scummvm/scummvm/commit/97a39f6a58bea450cfa5312f16f2889ddba7c7aa
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-06T16:53:52-04:00

Commit Message:
TITANIC: Fix movement cursors in Lift 4 when eye is removed

Changed paths:
    engines/titanic/game/transport/lift.cpp


diff --git a/engines/titanic/game/transport/lift.cpp b/engines/titanic/game/transport/lift.cpp
index ca5b744..17f1783 100644
--- a/engines/titanic/game/transport/lift.cpp
+++ b/engines/titanic/game/transport/lift.cpp
@@ -22,6 +22,7 @@
 
 #include "titanic/game/transport/lift.h"
 #include "titanic/pet_control/pet_control.h"
+#include "titanic/moves/multi_move.h"
 #include "titanic/titanic.h"
 
 namespace Titanic {
@@ -289,6 +290,17 @@ bool CLift::ActMsg(CActMsg *msg) {
 		actMsg1.execute("RPanInLiftW");
 		CActMsg actMsg2("Lift.Node 2.S");
 		actMsg2.execute("LPanInLiftW");
+
+		// WORKAROUND: In the original, when Lift 4's head is removed, the other
+		// view directions use Node 2. These "removed" views have links, but their
+		// movement cursors weren't correctly set. This fixes them
+		CNamedItem *node2 = findRoom()->findByName("Node 2");
+		static_cast<CMultiMove *>(node2->findByName("LMultiLiftPan"))->_cursorId = CURSOR_MOVE_LEFT;
+		static_cast<CLinkItem *>(node2->findByName("_PANR,2,N,E"))->_cursorId = CURSOR_MOVE_RIGHT;
+		static_cast<CLinkItem *>(node2->findByName("_PANL,2,E,N"))->_cursorId = CURSOR_MOVE_LEFT;
+		static_cast<CLinkItem *>(node2->findByName("_PANR,2,E,S"))->_cursorId = CURSOR_MOVE_RIGHT;
+		static_cast<CLinkItem *>(node2->findByName("_PANL,2,S,E"))->_cursorId = CURSOR_MOVE_LEFT;
+		static_cast<CMultiMove *>(node2->findByName("RMultiLiftPan"))->_cursorId = CURSOR_MOVE_RIGHT;
 	} else if (msg->_action == "AddWrongHead") {
 		_hasHead = true;
 		_hasCorrectHead = false;