[Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.258,2.259 vars.cpp,1.119,1.120

[kirben]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2881/scumm

Modified Files:
	script_v72he.cpp vars.cpp 
Log Message:

VAR78 needs to be set in HE80+ games
Active sound channels VAR exists in HE80 too.


Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.258
retrieving revision 2.259
diff -u -d -r2.258 -r2.259
--- script_v72he.cpp	16 Apr 2005 14:45:21 -0000	2.258
+++ script_v72he.cpp	16 Apr 2005 15:21:19 -0000	2.259
@@ -2135,7 +2135,7 @@
 	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 @@
 		error("o72_writeINI: default type %d", type);
 	}
 
+	debug(0, "o72_writeINI: option %s", option);
+
 	ConfMan.flushToDisk();
 }
 

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- vars.cpp	16 Apr 2005 14:59:15 -0000	1.119
+++ vars.cpp	16 Apr 2005 15:21:19 -0000	1.120
@@ -267,9 +267,8 @@
 	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 @@
 			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;