[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.369,1.370 string.cpp,1.244,1.245

Travis Howell kirben at users.sourceforge.net
Thu Aug 26 03:52:09 CEST 2004


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

Modified Files:
	sound.cpp string.cpp 
Log Message:

HE 7.2 games use @ as charset code
Small sound fix


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -d -r1.369 -r1.370
--- sound.cpp	26 Aug 2004 08:47:07 -0000	1.369
+++ sound.cpp	26 Aug 2004 10:51:10 -0000	1.370
@@ -751,7 +751,7 @@
 			// getSoundStatus(), with a -1, will return the
 			// ID number of the first active music it finds.
 			if (_currentMusic)
-				return (_musicChannelHandle.isActive()) ? _currentMusic : 0;
+				return (_musicChannelHandle.isActive()) ? 1 : 0;
 			else
 				return _vm->_imuse->getSoundStatus(sound);
 		}

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -d -r1.244 -r1.245
--- string.cpp	22 Aug 2004 07:22:03 -0000	1.244
+++ string.cpp	26 Aug 2004 10:51:11 -0000	1.245
@@ -512,7 +512,7 @@
 				num += (_version == 8) ? 4 : 2;
 			}
 		} else {
-			if (chr != '@') {
+			if (!(chr == '@' && _heversion <= 71)) {
 				*dst++ = chr;
 			}
 		}





More information about the Scummvm-git-logs mailing list