[Scummvm-cvs-logs] CVS: scummvm/simon simon.h,1.118,1.119 sound.cpp,1.56,1.57 vga.cpp,1.107,1.108

[Max Horn]

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

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

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- simon.h	23 Dec 2003 08:59:30 -0000	1.118
+++ simon.h	24 Dec 2003 00:25:01 -0000	1.119
@@ -26,7 +26,6 @@
 #include "base/engine.h"
 #include "common/util.h"
 #include "simon/midi.h"
-#include "sound/mixer.h"
 #include "simon/sound.h"
 
 class GameDetector;

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- sound.cpp	21 Dec 2003 16:01:36 -0000	1.56
+++ sound.cpp	24 Dec 2003 00:25:03 -0000	1.57
@@ -262,10 +262,6 @@
 	_last_voice_file = 0;
 	_offsets = 0;
 
-	_voice_handle = 0;
-	_effects_handle = 0;
-	_ambient_handle = 0;
-
 	_voice_file = false;
 	_ambient_playing = 0;
 

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- vga.cpp	23 Dec 2003 09:08:11 -0000	1.107
+++ vga.cpp	24 Dec 2003 00:25:05 -0000	1.108
@@ -1615,7 +1615,7 @@
 			vc_kill_sprite(file, start);
 		} while (++start != end);
 	} else {
-		if (_sound->_voice_handle == 0)
+		if (!_sound->_voice_handle.isActive())
 			vc_skip_next_instruction();
 	}
 }
@@ -1798,7 +1798,7 @@
 
 void SimonEngine::vc_64_skip_if_no_speech() {
 	// Simon2
-	if (_sound->_voice_handle == 0)
+	if (!_sound->_voice_handle.isActive())
 		vc_skip_next_instruction();
 }