[Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.154,1.155 scumm.cpp,1.362,1.363

kirben kirben at users.sourceforge.net
Mon Mar 14 17:22:07 CET 2005


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

Modified Files:
	costume.cpp scumm.cpp 
Log Message:

Off by one.


Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- costume.cpp	14 Mar 2005 21:13:34 -0000	1.154
+++ costume.cpp	15 Mar 2005 01:19:35 -0000	1.155
@@ -855,7 +855,7 @@
 		byte *patTable = getResourceAddress(rtCostume, v1MMNEScostTables[n][4]);
 		int j = 0;
 		int i = 3;
-		int maxSprites = 256; //patTable[3];
+		int maxSprites = 257; //patTable[3];
 		int len = READ_LE_UINT16(patTable);
 
 		if (maxSprites == 0)

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -d -r1.362 -r1.363
--- scumm.cpp	14 Mar 2005 21:13:35 -0000	1.362
+++ scumm.cpp	15 Mar 2005 01:19:36 -0000	1.363
@@ -1583,7 +1583,7 @@
 		_musicEngine = new Player_V2A(this);
 	} else if ((_features & GF_AMIGA) && (_version == 3)) {
 		_musicEngine = new Player_V3A(this);
-	} else if ((_features & GF_AMIGA) && (_version < 5)) {
+	} else if (((_features & GF_AMIGA) && (_version < 5)) || (_features & GF_NES)) {
 		_musicEngine = NULL;
 	} else if (((_midiDriver == MD_PCJR) || (_midiDriver == MD_PCSPK)) && ((_version > 2) && (_version < 5))) {
 		_musicEngine = new Player_V2(this, _midiDriver != MD_PCSPK);





More information about the Scummvm-git-logs mailing list