aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/core
diff options
context:
space:
mode:
authorPaul Gilbert2016-04-05 21:14:34 -0400
committerPaul Gilbert2016-04-05 21:14:34 -0400
commit19e4bca41c6ecc1f4f71f04d919af75bc14f2d58 (patch)
tree3e88580f0dae7be8c5be93d25cc8cfa285a999fc /engines/titanic/core
parent4e3ae0cf5642e62885e19ada83f922dd2fb91e1c (diff)
downloadscummvm-rg350-19e4bca41c6ecc1f4f71f04d919af75bc14f2d58.tar.gz
scummvm-rg350-19e4bca41c6ecc1f4f71f04d919af75bc14f2d58.tar.bz2
scummvm-rg350-19e4bca41c6ecc1f4f71f04d919af75bc14f2d58.zip
TITANIC: Set up cursors enum with better names
Diffstat (limited to 'engines/titanic/core')
-rw-r--r--engines/titanic/core/game_object.cpp2
-rw-r--r--engines/titanic/core/link_item.cpp10
-rw-r--r--engines/titanic/core/view_item.cpp6
3 files changed, 9 insertions, 9 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index 510e455656..d66fa58cb4 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -47,7 +47,7 @@ CGameObject::CGameObject(): CNamedItem() {
_field58 = 0;
_visible = true;
_field60 = 0;
- _cursorId = CURSOR_1;
+ _cursorId = CURSOR_ARROW;
_field78 = 0;
_frameNumber = -1;
_field90 = 0;
diff --git a/engines/titanic/core/link_item.cpp b/engines/titanic/core/link_item.cpp
index 5ca64b1c59..285838b692 100644
--- a/engines/titanic/core/link_item.cpp
+++ b/engines/titanic/core/link_item.cpp
@@ -32,7 +32,7 @@ CLinkItem::CLinkItem() : CNamedItem() {
_nodeNumber = -1;
_viewNumber = -1;
_field30 = 0;
- _cursorId = CURSOR_1;
+ _cursorId = CURSOR_ARROW;
_name = "Link";
}
@@ -93,16 +93,16 @@ void CLinkItem::load(SimpleFile *file) {
if (val < 2) {
switch (_field30) {
case 2:
- _cursorId = CURSOR_2;
+ _cursorId = CURSOR_MOVE_LEFT;
break;
case 3:
- _cursorId = CURSOR_3;
+ _cursorId = CURSOR_MOVE_RIGHT;
break;
case 5:
- _cursorId = CURSOR_7;
+ _cursorId = CURSOR_MOVE_FORWARD;
break;
default:
- _cursorId = CURSOR_4;
+ _cursorId = CURSOR_MOVE_FORWARD2;
break;
}
}
diff --git a/engines/titanic/core/view_item.cpp b/engines/titanic/core/view_item.cpp
index 47cdabbb50..c5cd77874b 100644
--- a/engines/titanic/core/view_item.cpp
+++ b/engines/titanic/core/view_item.cpp
@@ -204,7 +204,7 @@ bool CViewItem::handleMessage(CMouseMoveMsg &msg) {
CScreenManager *screenManager = CScreenManager::_screenManagerPtr;
if (handleMouseMsg(&msg, true)) {
- screenManager->_mouseCursor->setCursor(CURSOR_1);
+ screenManager->_mouseCursor->setCursor(CURSOR_ARROW);
} else {
// Iterate through each link item, and if any is highlighted,
// change the mouse cursor to the designated cursor for the item
@@ -219,7 +219,7 @@ bool CViewItem::handleMessage(CMouseMoveMsg &msg) {
}
if (!handleMouseMsg(&msg, false))
- screenManager->_mouseCursor->setCursor(CURSOR_1);
+ screenManager->_mouseCursor->setCursor(CURSOR_ARROW);
}
return true;
@@ -250,7 +250,7 @@ bool CViewItem::handleMouseMsg(CMouseMsg *msg, bool flag) {
return false;
for (int idx = (int)gameObjects.size() - 1; idx >= 0; ++idx) {
- if (gameObjects[idx]->_cursorId != CURSOR_12) {
+ if (gameObjects[idx]->_cursorId != CURSOR_ARROW2) {
CScreenManager::_screenManagerPtr->_mouseCursor->setCursor(gameObjects[idx]->_cursorId);
return true;
}