From 1507203d93dcd6466e8840928d46fc44d00720d1 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sat, 16 Apr 2005 15:21:19 +0000
Subject: VAR78 needs to be set in HE80+ games Active sound channels VAR exists
 in HE80 too.

svn-id: r17632
---
 scumm/script_v72he.cpp | 4 +++-
 scumm/vars.cpp         | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'scumm')

diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp
index 3d2bdd6c66..de200650d0 100644
--- a/scumm/script_v72he.cpp
+++ b/scumm/script_v72he.cpp
@@ -2135,7 +2135,7 @@ void ScummEngine_v72he::o72_writeINI() {
 	case 6: // number
 		value = pop();
 		copyScriptString(option, sizeof(option));
-		ConfMan.set((char *)option, value); 
+		ConfMan.set((char *)option, value);
 		break;
 	case 77: // HE 100
 	case 7: // string
@@ -2152,6 +2152,8 @@ void ScummEngine_v72he::o72_writeINI() {
 		error("o72_writeINI: default type %d", type);
 	}
 
+	debug(0, "o72_writeINI: option %s", option);
+
 	ConfMan.flushToDisk();
 }
 
diff --git a/scumm/vars.cpp b/scumm/vars.cpp
index fd981e48bb..a253112ea5 100644
--- a/scumm/vars.cpp
+++ b/scumm/vars.cpp
@@ -267,9 +267,8 @@ void ScummEngine_v72he::setupScummVars() {
 	if (_heversion >= 80)
 		VAR_WINDOWS_VERSION = 79;
 		VAR_KEY_STATE = 86;
-	if (_heversion >= 90) {
 		VAR_NUM_ACTIVE_SOUND_CHANNELS = 88;
-
+	if (_heversion >= 90) {
 		VAR_SCRIPT_CYCLE = 103;
 		VAR_NUM_SCRIPT_CYCLES = 104;
 
@@ -515,10 +514,11 @@ void ScummEngine::initScummVars() {
 			VAR(VAR_NUM_GLOBAL_OBJS) = _numGlobalObjects - 1;
 		}
 		if (_heversion >= 80)
+			VAR(78) = 1;
 			VAR(VAR_WINDOWS_VERSION) = 40;
-		if (_heversion >= 90) {
-			VAR(VAR_NUM_ACTIVE_SOUND_CHANNELS) = 8;
 
+			VAR(VAR_NUM_ACTIVE_SOUND_CHANNELS) = (_heversion >= 90) ? 8 : 4;
+		if (_heversion >= 90) {
 			VAR(VAR_SCRIPT_CYCLE) = 1;
 			VAR(VAR_NUM_SCRIPT_CYCLES) = 1;
 
-- 
cgit v1.2.3