[Scummvm-cvs-logs] SF.net SVN: scummvm: [31684] scummvm/trunk/engines/made/scriptfuncs.cpp

[thebluegr at users.sourceforge.net]

Revision: 31684
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31684&view=rev
Author:   thebluegr
Date:     2008-04-23 22:17:51 -0700 (Wed, 23 Apr 2008)

Log Message:
-----------
Slight cleanup to o1_PLAYSND

Modified Paths:
--------------
    scummvm/trunk/engines/made/scriptfuncs.cpp

Modified: scummvm/trunk/engines/made/scriptfuncs.cpp
===================================================================
--- scummvm/trunk/engines/made/scriptfuncs.cpp	2008-04-24 05:13:21 UTC (rev 31683)
+++ scummvm/trunk/engines/made/scriptfuncs.cpp	2008-04-24 05:17:51 UTC (rev 31684)
@@ -272,13 +272,15 @@
 }
 
 int16 ScriptFunctionsRtz::o1_PLAYSND(int16 argc, int16 *argv) {
-	int soundId = (argc == 1) ? argv[0] : argv[1];
+	int soundId = argv[0];
 	bool loop = false;
+
 	if (argc > 1) {
+		soundId = argv[1];
 		loop = (argv[0] == 1);
 	}
 
-	if (argv[0] > 0) {
+	if (soundId > 0) {
 		if (!_vm->_mixer->isSoundHandleActive(_audioStreamHandle)) {
 			_vm->_mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_audioStreamHandle, 
 										 _vm->_res->getSound(soundId)->getAudioStream(_vm->_soundRate, loop));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.