[Scummvm-cvs-logs] CVS: scummvm/simon sound.cpp,1.37,1.38 vga.cpp,1.79,1.80

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Sat Aug 30 13:36:06 CEST 2003


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

Modified Files:
	sound.cpp vga.cpp 
Log Message:
Reverted previous change since the mixer change was reverted.


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- sound.cpp	30 Aug 2003 20:14:30 -0000	1.37
+++ sound.cpp	30 Aug 2003 20:35:07 -0000	1.38
@@ -270,9 +270,9 @@
 	_filenums = 0;
 	_offsets = 0;
 
-	_voice_handle = -1;
-	_effects_handle = -1;
-	_ambient_handle = -1;
+	_voice_handle = 0;
+	_effects_handle = 0;
+	_ambient_handle = 0;
 
 	_voice_file = false;
 	_ambient_playing = 0;
@@ -440,7 +440,7 @@
 	if (!_voice)
 		return;
 
-	if (_voice_handle != -1)
+	if (_voice_handle)
 		_mixer->stop(_voice_index);
 
 	_voice_index = _voice->playSound(sound, &_voice_handle, (_game == GAME_SIMON1CD32) ? 0 : SoundMixer::FLAG_UNSIGNED);
@@ -468,7 +468,7 @@
 	if (_ambient_paused)
 		return;
 
-	if (_ambient_handle != -1)
+	if (_ambient_handle)
 		_mixer->stop(_ambient_index);
 
 	_ambient_index = _effects->playSound(sound, &_ambient_handle, SoundMixer::FLAG_LOOP|SoundMixer::FLAG_UNSIGNED);

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- vga.cpp	30 Aug 2003 20:14:30 -0000	1.79
+++ vga.cpp	30 Aug 2003 20:35:07 -0000	1.80
@@ -1597,7 +1597,7 @@
 			vc_kill_sprite(file, start);
 		} while (++start != end);
 	} else {
-		if (_sound->_voice_handle == -1)
+		if (_sound->_voice_handle == 0)
 			vc_skip_next_instruction();
 	}
 }
@@ -1775,7 +1775,7 @@
 
 void SimonEngine::vc_64_skip_if_no_speech() {
 	// Simon2
-	if (_sound->_voice_handle == -1)
+	if (_sound->_voice_handle == 0)
 		vc_skip_next_instruction();
 }
 





More information about the Scummvm-git-logs mailing list