[Scummvm-cvs-logs] CVS: scummvm/sword1 sound.cpp,1.14,1.15 sword1.h,1.8,1.9

Max Horn fingolfin at users.sourceforge.net
Tue Dec 23 16:26:03 CET 2003


Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1:/tmp/cvs-serv23172/sword1

Modified Files:
	sound.cpp sword1.h 
Log Message:
turned PlayingSoundHandle into an 'opaque' (well not really :-) data type, mainly because people kept (accidentally and sometimes on purpose :-) misusing them

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sound.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- sound.cpp	23 Dec 2003 00:59:18 -0000	1.14
+++ sound.cpp	24 Dec 2003 00:25:18 -0000	1.15
@@ -79,7 +79,7 @@
 			if (_fxQueue[cnt2].delay == 0)
 				playSample(&_fxQueue[cnt2]);
 		} else {
-			if (!_fxQueue[cnt2].handle) { // sound finished
+			if (!_fxQueue[cnt2].handle.isActive()) { // sound finished
 				_resMan->resClose(_fxList[_fxQueue[cnt2].id].sampleId);
 				if (cnt2 != _endOfQueue-1)
 					_fxQueue[cnt2] = _fxQueue[_endOfQueue - 1];
@@ -109,7 +109,7 @@
 }
 
 bool SwordSound::speechFinished(void) {
-	return (_speechHandle == 0);
+	return !_speechHandle.isActive();
 }
 
 void SwordSound::newScreen(uint32 screen) {

Index: sword1.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- sword1.h	22 Dec 2003 11:23:40 -0000	1.8
+++ sword1.h	24 Dec 2003 00:25:18 -0000	1.9
@@ -22,7 +22,6 @@
 #include <stdio.h>
 #include "base/engine.h"
 #include "common/util.h"
-#include "sound/mixer.h"
 #include "base/gameDetector.h"
 #include "sworddefs.h"
 





More information about the Scummvm-git-logs mailing list