[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.472,2.473 script_v72he.cpp,2.278,2.279 scumm.cpp,1.478,1.479 vars.cpp,1.128,1.129

kirben kirben at users.sourceforge.net
Sat Apr 30 23:55:19 CEST 2005


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

Modified Files:
	intern.h script_v72he.cpp scumm.cpp vars.cpp 
Log Message:

VAR_NUM_SOUND_CHANNELS is 88 in HE80+ games.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.472
retrieving revision 2.473
diff -u -d -r2.472 -r2.473
--- intern.h	30 Apr 2005 05:25:05 -0000	2.472
+++ intern.h	1 May 2005 06:54:27 -0000	2.473
@@ -939,8 +939,6 @@
 	void o72_setFilePath();
 	void o72_setWindowCaption();
 
-	byte VAR_NUM_ACTIVE_SOUND_CHANNELS;
-
 	byte VAR_NUM_ROOMS;
 	byte VAR_NUM_SCRIPTS;
 	byte VAR_NUM_SOUNDS;

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.278
retrieving revision 2.279
diff -u -d -r2.278 -r2.279
--- script_v72he.cpp	1 May 2005 01:30:19 -0000	2.278
+++ script_v72he.cpp	1 May 2005 06:54:27 -0000	2.279
@@ -2136,6 +2136,8 @@
 	default:
 		error("o72_readINI: default type %d", type);
 	}
+
+	debug(0, "o72_readINI: Option %s", option);
 }
 
 void ScummEngine_v72he::o72_writeINI() {

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -d -r1.478 -r1.479
--- scumm.cpp	30 Apr 2005 22:01:16 -0000	1.478
+++ scumm.cpp	1 May 2005 06:54:27 -0000	1.479
@@ -1280,8 +1280,6 @@
 
 ScummEngine_v72he::ScummEngine_v72he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16])
  : ScummEngine_v71he(detector, syst, gs, md5sum) {
-	VAR_NUM_ACTIVE_SOUND_CHANNELS = 0xFF;
-
 	VAR_NUM_ROOMS = 0xFF;
 	VAR_NUM_SCRIPTS = 0xFF;
 	VAR_NUM_SOUNDS = 0xFF;

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- vars.cpp	30 Apr 2005 05:25:06 -0000	1.128
+++ vars.cpp	1 May 2005 06:54:27 -0000	1.129
@@ -194,7 +194,6 @@
 }
 
 void ScummEngine_v72he::setupScummVars() {
-	// TODO Not complete
 	VAR_KEYPRESS = 0;
 	VAR_DEBUGMODE = 1;
 	VAR_TIMER_NEXT = 2;
@@ -245,7 +244,6 @@
 	VAR_SOUND_CHANNEL = 51;
 	VAR_MUSIC_CHANNEL = 52;
 
-	VAR_NUM_SOUND_CHANNELS = 56;
 	VAR_MEMORY_PERFORMANCE = 57;
 	VAR_VIDEO_PERFORMANCE = 58;
 	VAR_NEW_ROOM = 59;
@@ -268,10 +266,13 @@
 	VAR_MOUSE_STATE = 75;
 	VAR_POLYGONS_ONLY = 76;
 
+	if (_heversion == 72) {
+		VAR_NUM_SOUND_CHANNELS = 56;
+	}
 	if (_heversion >= 80)
 		VAR_WINDOWS_VERSION = 79;
 		VAR_KEY_STATE = 86;
-		VAR_NUM_ACTIVE_SOUND_CHANNELS = 88;
+		VAR_NUM_SOUND_CHANNELS = 88;
 	if (_heversion >= 90) {
 		VAR_SCRIPT_CYCLE = 103;
 		VAR_NUM_SCRIPT_CYCLES = 104;
@@ -552,8 +553,6 @@
 
 	VAR(78) = 1;
 	VAR(VAR_WINDOWS_VERSION) = 40;
-
-	VAR(VAR_NUM_ACTIVE_SOUND_CHANNELS) = (_heversion >= 90) ? 8 : 4;
 }
 
 void ScummEngine_v90he::initScummVars() {





More information about the Scummvm-git-logs mailing list