From 216d3c5cefc6537a6705dfce91e4b77029a58666 Mon Sep 17 00:00:00 2001
From: Bastien Bouclet
Date: Sun, 7 Aug 2011 15:36:26 +0200
Subject: MOHAWK: Leaving from the slides should go to the information screens
 in Myst Demo.

---
 engines/mohawk/myst_stacks/slides.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'engines/mohawk/myst_stacks/slides.cpp')

diff --git a/engines/mohawk/myst_stacks/slides.cpp b/engines/mohawk/myst_stacks/slides.cpp
index 72b299ee6d..9c00ded665 100644
--- a/engines/mohawk/myst_stacks/slides.cpp
+++ b/engines/mohawk/myst_stacks/slides.cpp
@@ -59,23 +59,20 @@ void Slides::disablePersistentScripts() {
 void Slides::runPersistentScripts() {
 	if (_cardSwapEnabled) {
 		// Used on Cards...
-		if (_vm->_system->getMillis() - _lastCardTime >= 2 * 1000)
+		if (_vm->_system->getMillis() > _nextCardTime)
 			_vm->changeToCard(_nextCardID, true);
 	}
 }
 
 void Slides::o_returnToMenu(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
-	_vm->changeToStack(kDemoStack, 2001, 0, 0);
+	// Go to the information screens of the menu
+	_vm->changeToStack(kDemoStack, 2002, 0, 0);
 }
 
 void Slides::o_setCardSwap(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
-	// Used on Cards...
-	if (argc == 1) {
-		_nextCardID = argv[0];
-		_lastCardTime = _vm->_system->getMillis();
-		_cardSwapEnabled = true;
-	} else
-		unknown(op, var, argc, argv);
+	_nextCardID = argv[0];
+	_nextCardTime = _vm->_system->getMillis() + 5000;
+	_cardSwapEnabled = true;
 }
 
 } // End of namespace MystStacks
-- 
cgit v1.2.3


From 2345228643239745423ecb846efc04a5c935bebc Mon Sep 17 00:00:00 2001
From: Bastien Bouclet
Date: Sun, 7 Aug 2011 16:48:40 +0200
Subject: MOHAWK: Add specific cursor handling for Myst demo

---
 engines/mohawk/myst_stacks/slides.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'engines/mohawk/myst_stacks/slides.cpp')

diff --git a/engines/mohawk/myst_stacks/slides.cpp b/engines/mohawk/myst_stacks/slides.cpp
index 9c00ded665..e9bb91c84d 100644
--- a/engines/mohawk/myst_stacks/slides.cpp
+++ b/engines/mohawk/myst_stacks/slides.cpp
@@ -20,6 +20,7 @@
  *
  */
 
+#include "mohawk/cursors.h"
 #include "mohawk/myst.h"
 #include "mohawk/graphics.h"
 #include "mohawk/myst_areas.h"
@@ -35,6 +36,7 @@ namespace MystStacks {
 
 Slides::Slides(MohawkEngine_Myst *vm) : MystScriptParser(vm) {
 	setupOpcodes();
+	_vm->_cursor->hideCursor();
 }
 
 Slides::~Slides() {
-- 
cgit v1.2.3


From df381055c44452baf02a7384d50429d8717c432f Mon Sep 17 00:00:00 2001
From: Bastien Bouclet
Date: Sun, 14 Aug 2011 09:15:58 +0200
Subject: MOHAWK: Implement remaining Myst demo menu opcodes

---
 engines/mohawk/myst_stacks/slides.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'engines/mohawk/myst_stacks/slides.cpp')

diff --git a/engines/mohawk/myst_stacks/slides.cpp b/engines/mohawk/myst_stacks/slides.cpp
index e9bb91c84d..943cb90071 100644
--- a/engines/mohawk/myst_stacks/slides.cpp
+++ b/engines/mohawk/myst_stacks/slides.cpp
@@ -61,18 +61,26 @@ void Slides::disablePersistentScripts() {
 void Slides::runPersistentScripts() {
 	if (_cardSwapEnabled) {
 		// Used on Cards...
-		if (_vm->_system->getMillis() > _nextCardTime)
+		if (_vm->_system->getMillis() > _nextCardTime) {
+			_vm->_gfx->fadeToBlack();
 			_vm->changeToCard(_nextCardID, true);
+			_vm->_gfx->fadeFromBlack();
+		}
 	}
 }
 
 void Slides::o_returnToMenu(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+	debugC(kDebugScript, "Opcode %d: Return to menu", op);
+
 	// Go to the information screens of the menu
 	_vm->changeToStack(kDemoStack, 2002, 0, 0);
 }
 
 void Slides::o_setCardSwap(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	_nextCardID = argv[0];
+
+	debugC(kDebugScript, "Opcode %d: Set next card %d", op, _nextCardID);
+
 	_nextCardTime = _vm->_system->getMillis() + 5000;
 	_cardSwapEnabled = true;
 }
-- 
cgit v1.2.3


From 3ca0b304cf29f12d5fb3cadccb18689306d33ff8 Mon Sep 17 00:00:00 2001
From: Bastien Bouclet
Date: Mon, 15 Aug 2011 08:52:11 +0200
Subject: MOHAWK: Implement fading for Myst Demo

---
 engines/mohawk/myst_stacks/slides.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/mohawk/myst_stacks/slides.cpp')

diff --git a/engines/mohawk/myst_stacks/slides.cpp b/engines/mohawk/myst_stacks/slides.cpp
index 943cb90071..794793e49c 100644
--- a/engines/mohawk/myst_stacks/slides.cpp
+++ b/engines/mohawk/myst_stacks/slides.cpp
@@ -63,7 +63,7 @@ void Slides::runPersistentScripts() {
 		// Used on Cards...
 		if (_vm->_system->getMillis() > _nextCardTime) {
 			_vm->_gfx->fadeToBlack();
-			_vm->changeToCard(_nextCardID, true);
+			_vm->changeToCard(_nextCardID, false);
 			_vm->_gfx->fadeFromBlack();
 		}
 	}
-- 
cgit v1.2.3