From ae6f248616a144050337e9687033402c4868d558 Mon Sep 17 00:00:00 2001
From: Bastien Bouclet
Date: Sat, 11 Feb 2017 08:00:07 +0100
Subject: MOHAWK: Move Riven's sunner alert handling to the jungle stack

---
 engines/mohawk/riven.cpp | 31 -------------------------------
 1 file changed, 31 deletions(-)

(limited to 'engines/mohawk/riven.cpp')

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())
-- 
cgit v1.2.3