From e9c6b03fc73ad5d556eb56afed6e55ef1b0bef67 Mon Sep 17 00:00:00 2001
From: Christopher Page
Date: Fri, 11 Jul 2008 01:22:37 +0000
Subject: SCUMM works with new GMM implementation

svn-id: r33001
---
 engines/scumm/script_v8.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/scumm/script_v8.cpp')

diff --git a/engines/scumm/script_v8.cpp b/engines/scumm/script_v8.cpp
index 08629afb07..63e54417a9 100644
--- a/engines/scumm/script_v8.cpp
+++ b/engines/scumm/script_v8.cpp
@@ -1170,7 +1170,7 @@ void ScummEngine_v8::o8_systemOps() {
 		restart();
 		break;
 	case 0x29:		// SO_SYSTEM_QUIT Quit game
-		shutDown();
+		quitGame();
 		break;
 	default:
 		error("o8_systemOps: invalid case 0x%x", subOp);
@@ -1289,7 +1289,7 @@ void ScummEngine_v8::o8_kernelSetFunctions() {
 		if (ConfMan.getBool("confirm_exit"))
 			confirmExitDialog();
 		else
-			_quit = true;
+			quitGame();
 		break;
 	case 108:	// buildPaletteShadow
 		setShadowPalette(args[1], args[2], args[3], args[4], args[5], args[6]);
-- 
cgit v1.2.3


From d4853dd9e84b43cfcc410829625c19c4b9d0b6c6 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 17 Sep 2008 18:56:13 +0000
Subject: Patch #2060517: SCUMM: engine sets incorrect talkspeed value

svn-id: r34596
---
 engines/scumm/script_v8.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/scumm/script_v8.cpp')

diff --git a/engines/scumm/script_v8.cpp b/engines/scumm/script_v8.cpp
index 63e54417a9..8859435dc9 100644
--- a/engines/scumm/script_v8.cpp
+++ b/engines/scumm/script_v8.cpp
@@ -424,10 +424,10 @@ void ScummEngine_v8::writeVar(uint var, int value) {
 
 		if (var == VAR_CHARINC) {
 			if (ConfMan.hasKey("talkspeed")) {
-				value = getTalkspeed();
+				value = getTalkDelay();
 			} else {
 				// Save the new talkspeed value to ConfMan
-				setTalkspeed(value);
+				setTalkDelay(value);
 			}
 		}
 
-- 
cgit v1.2.3