aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/pink/constants.h15
-rw-r--r--engines/pink/cursor_mgr.cpp2
-rw-r--r--engines/pink/pink.cpp14
3 files changed, 18 insertions, 13 deletions
diff --git a/engines/pink/constants.h b/engines/pink/constants.h
index 7e945f8a6a..a641231546 100644
--- a/engines/pink/constants.h
+++ b/engines/pink/constants.h
@@ -85,7 +85,7 @@ enum {
};
enum {
- kCursorsCount = 11
+ kCursorsCount = 12
};
enum {
@@ -98,8 +98,9 @@ enum {
kClickableSecondFrameCursor = 6,
kNotClickableCursor = 7,
kHoldingItemCursor = 8,
- kPDAFirstCursor = 9,
- kPDASecondCursor = 10
+ kPDADefaultCursor = 9,
+ kPDAClickableFirstFrameCursor = 10,
+ kPDAClickableSecondFrameCursor = 11
};
@@ -114,8 +115,9 @@ enum {
kPokusClickableThirdCursorID = 145,
kPokusNotClickableCursorID = 140,
kPokusHoldingItemCursorID = 147,
- kPokusPDAFirstCursorID = 141,
- kPokusPDASecondCursorID = 144
+ kPokusPDADefaultCursorID = 141,
+ kPokusPDAClickableFirstFrameCursorID = 144,
+ kPokusPDAClickableSecondFrameCursorID = 146
};
// from Peril
@@ -124,7 +126,8 @@ enum {
kPerilClickableThirdCursorID = 140,
kPerilNotClickableCursorID = 139,
kPerilHoldingItemCursorID = 101,
- kPerilPDASecondCursorID = 142
+ kPerilPDAClickableFirstFrameCursorID = 142,
+ kPerilPDAClickableSecondFrameCursorID = 143
};
enum {
diff --git a/engines/pink/cursor_mgr.cpp b/engines/pink/cursor_mgr.cpp
index 0154a33d77..391e45db99 100644
--- a/engines/pink/cursor_mgr.cpp
+++ b/engines/pink/cursor_mgr.cpp
@@ -41,7 +41,7 @@ void CursorMgr::setCursor(uint index, Common::Point point, const Common::String
return hideItem();
} else if (index != kHoldingItemCursor) {
- if (index != kPDASecondCursor) {
+ if (index != kPDAClickableFirstFrameCursor) {
_game->setCursor(index);
_isPlayingAnimation = 0;
return hideItem();
diff --git a/engines/pink/pink.cpp b/engines/pink/pink.cpp
index 3931db840e..a0aa9ef820 100644
--- a/engines/pink/pink.cpp
+++ b/engines/pink/pink.cpp
@@ -231,13 +231,15 @@ bool PinkEngine::loadCursors() {
_cursors.push_back(Graphics::WinCursorGroup::createCursorGroup(exeResources, kPerilHoldingItemCursorID));
}
- _cursors.push_back(Graphics::WinCursorGroup::createCursorGroup(exeResources, kPokusPDAFirstCursorID));
-
- if (isPokus)
- _cursors.push_back(Graphics::WinCursorGroup::createCursorGroup(exeResources, kPokusPDASecondCursorID));
- else
- _cursors.push_back(Graphics::WinCursorGroup::createCursorGroup(exeResources, kPerilPDASecondCursorID));
+ _cursors.push_back(Graphics::WinCursorGroup::createCursorGroup(exeResources, kPokusPDADefaultCursorID));
+ if (isPokus) {
+ _cursors.push_back(Graphics::WinCursorGroup::createCursorGroup(exeResources, kPokusPDAClickableFirstFrameCursorID));
+ _cursors.push_back(Graphics::WinCursorGroup::createCursorGroup(exeResources, kPokusPDAClickableSecondFrameCursorID));
+ } else {
+ _cursors.push_back(Graphics::WinCursorGroup::createCursorGroup(exeResources, kPerilPDAClickableFirstFrameCursorID));
+ _cursors.push_back(Graphics::WinCursorGroup::createCursorGroup(exeResources, kPerilPDAClickableSecondFrameCursorID));
+ }
return true;
}