[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.215,1.216 sound.cpp,1.391,1.392 string.cpp,1.253,1.254

[Travis Howell]

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

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

Actually check if a sound is active, if the sound is outside music engine.
Add some more HE differences


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -d -r1.215 -r1.216
--- scumm.cpp	19 Sep 2004 08:37:20 -0000	1.215
+++ scumm.cpp	19 Sep 2004 12:22:47 -0000	1.216
@@ -1159,7 +1159,7 @@
 	else if (_gameId == GID_MANIAC)
 		_numActors = 25;
 	else if (_heversion >= 80)
-		_numActors = 62;
+		_numActors = 63;
 	else 
 		_numActors = 13;
 

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -d -r1.391 -r1.392
--- sound.cpp	15 Sep 2004 12:14:25 -0000	1.391
+++ sound.cpp	19 Sep 2004 12:22:47 -0000	1.392
@@ -779,6 +779,9 @@
 	if (!_vm->isResourceLoaded(rtSound, sound))
 		return 0;
 
+	if (_vm->_mixer->isSoundIDActive(sound))
+		return 1;
+
 	if (_vm->_musicEngine)
 		return _vm->_musicEngine->getSoundStatus(sound);
 

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -d -r1.253 -r1.254
--- string.cpp	18 Sep 2004 22:42:44 -0000	1.253
+++ string.cpp	19 Sep 2004 12:22:47 -0000	1.254
@@ -386,6 +386,7 @@
 	int i, c;
 	byte fontHeight = 0;
 	uint color;
+	int code = (_heversion >= 80) ? 127 : 64;
 
 	addMessageToStack(msg, buf, sizeof(buf));
 
@@ -433,7 +434,19 @@
 	}
 
 	for (i = 0; (c = buf[i++]) != 0;) {
-		if (c == 0xFE || c == 0xFF) {
+		if (c == code) {
+			c = buf[i++];
+			switch (c) {
+			case 110:
+				if (_charset->_center) {
+					_charset->_left = _charset->_startLeft - _charset->getStringWidth(a, buf + i);
+				} else {
+					_charset->_left = _charset->_startLeft;
+				}
+				_charset->_top += fontHeight;
+				break;
+			}
+		} else if (c == 0xFE || c == 0xFF) {
 			c = buf[i++];
 			switch (c) {
 			case 9: