[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.213,2.214 scummvm.cpp,2.404,2.405 sound.cpp,1.255,1.256

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv17669

Modified Files:
	gfx.cpp scummvm.cpp sound.cpp 
Log Message:
some minor cleanup

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.213
retrieving revision 2.214
diff -u -d -r2.213 -r2.214
--- gfx.cpp	14 Sep 2003 18:16:44 -0000	2.213
+++ gfx.cpp	27 Sep 2003 20:31:18 -0000	2.214
@@ -933,15 +933,15 @@
 		numzbuf = _numZBuffer;
 		assert(numzbuf <= ARRAYSIZE(zplane_list));
 		
-		if (_vm->_features & GF_OLD256) {
-			zplane_list[1] = smap_ptr + READ_LE_UINT32(smap_ptr);
-			if (0 == READ_LE_UINT32(zplane_list[1]))
-				zplane_list[1] = 0;
-		} else if (_vm->_features & GF_SMALL_HEADER) {
+		if (_vm->_features & GF_SMALL_HEADER) {
 			if (_vm->_features & GF_16COLOR)
 				zplane_list[1] = smap_ptr + READ_LE_UINT16(smap_ptr);
 			else
 				zplane_list[1] = smap_ptr + READ_LE_UINT32(smap_ptr);
+			if (_vm->_features & GF_OLD256) {
+				if (0 == READ_LE_UINT32(zplane_list[1]))
+					zplane_list[1] = 0;
+			}
 			for (i = 2; i < numzbuf; i++) {
 				zplane_list[i] = zplane_list[i-1] + READ_LE_UINT16(zplane_list[i-1]);
 			}
@@ -1198,7 +1198,7 @@
 			}
 		} else {
 			for (i = 1; i < numzbuf; i++) {
-				uint16 offs;
+				uint32 offs;
 
 				if (!zplane_list[i])
 					continue;
@@ -1210,7 +1210,7 @@
 				else if (_vm->_features & GF_SMALL_HEADER)
 					offs = READ_LE_UINT16(zplane_list[i] + stripnr * 2 + 2);
 				else if (_vm->_version == 8)
-					offs = (uint16) READ_LE_UINT32(zplane_list[i] + stripnr * 4 + 8);
+					offs = READ_LE_UINT32(zplane_list[i] + stripnr * 4 + 8);
 				else
 					offs = READ_LE_UINT16(zplane_list[i] + stripnr * 2 + 8);
 

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.404
retrieving revision 2.405
diff -u -d -r2.404 -r2.405
--- scummvm.cpp	25 Sep 2003 22:32:04 -0000	2.404
+++ scummvm.cpp	27 Sep 2003 20:31:19 -0000	2.405
@@ -1802,7 +1802,7 @@
 
 	if (_version <= 2)
 		saveloadkey = 5;	// F5
-	else if ((_features & GF_OLD256) || (_gameId == GID_CMI) || (_features & GF_16COLOR)) /* FIXME: Support ingame screen ? */
+	else if ((_version <= 3) || (_gameId == GID_CMI)) /* FIXME: Support ingame screen ? */
 		saveloadkey = 319;	// F5
 	else
 		saveloadkey = VAR(VAR_SAVELOADDIALOG_KEY);

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -d -r1.255 -r1.256
--- sound.cpp	24 Sep 2003 06:56:30 -0000	1.255
+++ sound.cpp	27 Sep 2003 20:31:19 -0000	1.256
@@ -126,9 +126,8 @@
 }
 
 void Sound::addSoundToQueue2(int sound) {
-	if (_soundQue2Pos < 10) {
-		_soundQue2[_soundQue2Pos++] = sound;
-	}
+	assert(_soundQue2Pos < ARRAYSIZE(_soundQue2));
+	_soundQue2[_soundQue2Pos++] = sound;
 }
 
 void Sound::processSoundQues() {
@@ -196,17 +195,6 @@
 		assert(_scumm->_musicEngine);
 		_scumm->_musicEngine->startSound(soundID);
 	}
-/*
-	// XMIDI 
-	else if ((READ_UINT32(ptr) == MKID('MIDI')) && (_scumm->_features & GF_HUMONGOUS)) {
-		// Pass XMIDI on to IMuse unprocessed.
-		// IMuse can handle XMIDI resources now.
-	}
-	else if (READ_UINT32(ptr) == MKID('ADL ')) {
-		// played as MIDI, just to make perhaps the later use
-		// of WA possible (see "else if" with GF_OLD256 below)
-	}
-*/
 	else if (READ_UINT32(ptr) == MKID('SOUN')) {
 		ptr += 24;
 		int track = ptr[0];