[Scummvm-git-logs] scummvm master -> f9c370d942d28c15b44a7f1786fac3e9e3bb545f

[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:
f9c370d942 TITANIC: Fixes for names in the CursorId enum


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

Commit Message:
TITANIC: Fixes for names in the CursorId enum

Changed paths:
    engines/titanic/core/link_item.cpp
    engines/titanic/game/bottom_of_well_monitor.cpp
    engines/titanic/support/mouse_cursor.h


diff --git a/engines/titanic/core/link_item.cpp b/engines/titanic/core/link_item.cpp
index 977d2f1..a131b85 100644
--- a/engines/titanic/core/link_item.cpp
+++ b/engines/titanic/core/link_item.cpp
@@ -132,7 +132,7 @@ void CLinkItem::load(SimpleFile *file) {
 			_cursorId = CURSOR_MOVE_FORWARD;
 			break;
 		default:
-			_cursorId = CURSOR_MOVE_FORWARD2;
+			_cursorId = CURSOR_MOVE_THROUGH;
 			break;
 		}
 	}
diff --git a/engines/titanic/game/bottom_of_well_monitor.cpp b/engines/titanic/game/bottom_of_well_monitor.cpp
index bf19023..3c87735 100644
--- a/engines/titanic/game/bottom_of_well_monitor.cpp
+++ b/engines/titanic/game/bottom_of_well_monitor.cpp
@@ -56,7 +56,7 @@ bool CBottomOfWellMonitor::ActMsg(CActMsg *msg) {
 		CVisibleMsg visibleMsg;
 		visibleMsg.execute("CrushedTV2NE");
 		visibleMsg.execute("CrushedTV4SW");
-		_cursorId = CURSOR_MOVE_DOWN1;
+		_cursorId = CURSOR_LOOK_DOWN;
 	} else if (msg->_action == "TelevisionTaken") {
 		_tvPresent = false;
 		_cursorId = CURSOR_ARROW;
diff --git a/engines/titanic/support/mouse_cursor.h b/engines/titanic/support/mouse_cursor.h
index 325e31d..aff3bac 100644
--- a/engines/titanic/support/mouse_cursor.h
+++ b/engines/titanic/support/mouse_cursor.h
@@ -36,9 +36,9 @@ enum CursorId {
 	CURSOR_MOVE_LEFT = 2,
 	CURSOR_MOVE_RIGHT = 3,
 	CURSOR_MOVE_FORWARD = 4,
-	CURSOR_MOVE_UP = 5,
-	CURSOR_MOVE_DOWN1 = 6,
-	CURSOR_MOVE_FORWARD2 = 7,
+	CURSOR_LOOK_UP = 5,
+	CURSOR_LOOK_DOWN = 6,
+	CURSOR_MOVE_THROUGH = 7,
 	CURSOR_HAND = 8,
 	CURSOR_ACTIVATE = 9,
 	CURSOR_INVALID = 10,