aboutsummaryrefslogtreecommitdiff
path: root/engines/mohawk/riven.cpp
diff options
context:
space:
mode:
authorBastien Bouclet2017-02-11 08:00:07 +0100
committerEugene Sandulenko2017-07-03 08:50:10 +0200
commitae6f248616a144050337e9687033402c4868d558 (patch)
tree2358c3475c267c0def0548dc457c440fb7d88523 /engines/mohawk/riven.cpp
parentf0267d542f860a2f67f519a1dc5343e020927c81 (diff)
downloadscummvm-rg350-ae6f248616a144050337e9687033402c4868d558.tar.gz
scummvm-rg350-ae6f248616a144050337e9687033402c4868d558.tar.bz2
scummvm-rg350-ae6f248616a144050337e9687033402c4868d558.zip
MOHAWK: Move Riven's sunner alert handling to the jungle stack
Diffstat (limited to 'engines/mohawk/riven.cpp')
-rw-r--r--engines/mohawk/riven.cpp31
1 files changed, 0 insertions, 31 deletions
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index 1c40acd135..197065b7e6 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -216,9 +216,6 @@ void MohawkEngine_Riven::doFrame() {
needsUpdate = true;
break;
case Common::EVENT_LBUTTONDOWN:
- if (_card->getCurHotspot()) {
- checkSunnerAlertClick();
- }
_stack->onMouseDown(_eventMan->getMousePos());
break;
case Common::EVENT_LBUTTONUP:
@@ -507,34 +504,6 @@ void MohawkEngine_Riven::doVideoTimer(VideoHandle handle, bool force) {
_scriptMan->runStoredMovieOpcode();
}
-void MohawkEngine_Riven::checkSunnerAlertClick() {
- // We need to do a manual hardcoded check for the sunners'
- // alert movies.
-
- uint32 &sunners = _vars["jsunners"];
-
- // If the sunners are gone, there's nothing for us to do
- if (sunners != 0)
- return;
-
- uint32 rmapCode = _stack->getCurrentCardGlobalId();
-
- // This is only for the mid/lower staircase sections
- if (rmapCode != 0x79bd && rmapCode != 0x7beb)
- return;
-
- // Only set the sunners variable on the forward hotspot
- if (_card->getCurHotspot()->getBlstId() != 3)
- return;
-
- // If the alert video is no longer playing, we have nothing left to do
- VideoEntryPtr video = _video->findVideoRiven(1);
- if (!video || video->endOfVideo())
- return;
-
- sunners = 1;
-}
-
void MohawkEngine_Riven::addZipVisitedCard(uint16 cardId, uint16 cardNameId) {
Common::String cardName = getStack()->getName(kCardNames, cardNameId);
if (cardName.empty())