From de5015dce4bbdaa49c9595610af636b3b700be90 Mon Sep 17 00:00:00 2001
From: Bastien Bouclet
Date: Sun, 7 Feb 2016 08:13:14 +0100
Subject: MOHAWK: Fix some incorrect MystArea casts

---
 engines/mohawk/myst_stacks/channelwood.cpp | 4 ++--
 engines/mohawk/myst_stacks/channelwood.h   | 2 +-
 engines/mohawk/myst_stacks/myst.cpp        | 4 ++--
 engines/mohawk/myst_stacks/myst.h          | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'engines/mohawk')

diff --git a/engines/mohawk/myst_stacks/channelwood.cpp b/engines/mohawk/myst_stacks/channelwood.cpp
index fe93770b9c..cd6935bdeb 100644
--- a/engines/mohawk/myst_stacks/channelwood.cpp
+++ b/engines/mohawk/myst_stacks/channelwood.cpp
@@ -680,7 +680,7 @@ void Channelwood::o_hologramTemple(uint16 op, uint16 var, uint16 argc, uint16 *a
 void Channelwood::o_executeMouseUp(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: Execute mouse up", op);
 
-	MystAreaAction *resource = _vm->getViewResource<MystAreaAction>(argv[0]);
+	MystArea *resource = _vm->getViewResource<MystArea>(argv[0]);
 	resource->handleMouseUp();
 }
 
@@ -753,7 +753,7 @@ void Channelwood::o_soundReplace(uint16 op, uint16 var, uint16 argc, uint16 *arg
 
 void Channelwood::o_lever_init(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: Generic lever init", op);
-	_leverAction = getInvokingResource<MystAreaAction>();
+	_leverAction = getInvokingResource<MystArea>();
 }
 
 void Channelwood::o_pipeValve_init(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
diff --git a/engines/mohawk/myst_stacks/channelwood.h b/engines/mohawk/myst_stacks/channelwood.h
index c141a62cd6..ac875e52d8 100644
--- a/engines/mohawk/myst_stacks/channelwood.h
+++ b/engines/mohawk/myst_stacks/channelwood.h
@@ -94,7 +94,7 @@ private:
 	uint16 _doorOpened; // 68
 
 	bool _leverPulled;
-	MystAreaAction *_leverAction; // 72
+	MystArea *_leverAction; // 72
 
 	bool pipeChangeValve(bool open, uint16 mask);
 };
diff --git a/engines/mohawk/myst_stacks/myst.cpp b/engines/mohawk/myst_stacks/myst.cpp
index c5e151cdf0..4009d0d1f4 100644
--- a/engines/mohawk/myst_stacks/myst.cpp
+++ b/engines/mohawk/myst_stacks/myst.cpp
@@ -3189,7 +3189,7 @@ void Myst::towerRotationMap_run() {
 
 void Myst::o_towerRotationMap_init(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	_towerRotationMapRunning = true;
-	_towerRotationMapTower = getInvokingResource<MystAreaDrag>();
+	_towerRotationMapTower = getInvokingResource<MystAreaImageSwitch>();
 	_towerRotationMapLabel = _vm->getViewResource<MystAreaImageSwitch>(argv[0]);
 	_tempVar = 0;
 	_startTime = 0;
@@ -3620,7 +3620,7 @@ void Myst::o_treeCard_init(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 void Myst::o_treeEntry_init(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: Enter tree card with entry", op);
 
-	_treeAlcove = getInvokingResource<MystAreaAction>();
+	_treeAlcove = getInvokingResource<MystArea>();
 	_treeMinAccessiblePosition = argv[0];
 	_treeMaxAccessiblePosition = argv[1];
 
diff --git a/engines/mohawk/myst_stacks/myst.h b/engines/mohawk/myst_stacks/myst.h
index 704ca81c07..5c84cd7f96 100644
--- a/engines/mohawk/myst_stacks/myst.h
+++ b/engines/mohawk/myst_stacks/myst.h
@@ -247,7 +247,7 @@ protected:
 	bool _towerRotationBlinkLabel;
 	uint16 _towerRotationBlinkLabelCount;
 	uint16 _towerRotationMapInitialized; // 292
-	MystAreaDrag *_towerRotationMapTower; // 108
+	MystAreaImageSwitch *_towerRotationMapTower; // 108
 	MystAreaImageSwitch *_towerRotationMapLabel; // 112
 	uint16 _towerRotationSpeed; // 124
 	bool _towerRotationMapClicked; // 132
@@ -269,7 +269,7 @@ protected:
 
 	bool _treeStopped; // 236
 	MystAreaImageSwitch *_tree; // 220
-	MystAreaAction *_treeAlcove; // 224
+	MystArea *_treeAlcove; // 224
 	uint16 _treeMinPosition; // 228
 	uint16 _treeMinAccessiblePosition; // 230
 	uint16 _treeMaxAccessiblePosition; // 232
-- 
cgit v1.2.3