[Scummvm-cvs-logs] CVS: scummvm/scumm palette.cpp,2.44,2.45 scumm.cpp,1.529,1.530 sound.cpp,1.464,1.465 vars.cpp,1.138,1.139

[kirben]

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

Modified Files:
	palette.cpp scumm.cpp sound.cpp vars.cpp 
Log Message:

Adjust for HE73.


Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/palette.cpp,v
retrieving revision 2.44
retrieving revision 2.45
diff -u -d -r2.44 -r2.45
--- palette.cpp	18 May 2005 02:23:00 -0000	2.44
+++ palette.cpp	21 May 2005 14:28:21 -0000	2.45
@@ -255,7 +255,7 @@
 
 		// Only SCUMM 5/6 games use 6/6/6 style palettes
 		if (_version >= 5 && _version <= 6) {
-			if ((_heversion <= 72 && i < 15) || i == 15 || r < 252 || g < 252 || b < 252) {
+			if ((_heversion <= 73 && i < 15) || i == 15 || r < 252 || g < 252 || b < 252) {
 				*dest++ = r;
 				*dest++ = g;
 				*dest++ = b;

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.529
retrieving revision 1.530
diff -u -d -r1.529 -r1.530
--- scumm.cpp	21 May 2005 14:20:28 -0000	1.529
+++ scumm.cpp	21 May 2005 14:28:21 -0000	1.530
@@ -1311,7 +1311,7 @@
 #ifndef DISABLE_HE
 ScummEngine_v70he::ScummEngine_v70he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex)
 	: ScummEngine_v60he(detector, syst, gs, md5sum, substResFileNameIndex) {
-	if (_platform == Common::kPlatformMacintosh && _heversion == 72) 
+	if (_platform == Common::kPlatformMacintosh && (_heversion >= 72 && _heversion <= 73)) 
 		_resExtractor = new MacResExtractor(this);
 	else
 		_resExtractor = new Win32ResExtractor(this);

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -d -r1.464 -r1.465
--- sound.cpp	21 May 2005 11:13:46 -0000	1.464
+++ sound.cpp	21 May 2005 14:28:21 -0000	1.465
@@ -1160,7 +1160,7 @@
 			_vm->generateSubstResFileName(buf, buf1, sizeof(buf1));
 			strcpy(buf, buf1);
 		}
-		if (file->open(buf) && _vm->_heversion <= 72) 
+		if (file->open(buf) && _vm->_heversion <= 73) 
 			file->setEnc(0x69);
 		_soundMode = kVOCMode;
 	}

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- vars.cpp	14 May 2005 23:28:21 -0000	1.138
+++ vars.cpp	21 May 2005 14:28:21 -0000	1.139
@@ -276,7 +276,7 @@
 	VAR_MOUSE_STATE = 75;
 	VAR_POLYGONS_ONLY = 76;
 
-	if (_heversion == 72) {
+	if (_heversion <= 73) {
 		VAR_NUM_SOUND_CHANNELS = 56;
 	}
 	if (_heversion >= 80)