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

[john_doe at users.sourceforge.net]

Revision: 32068
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32068&view=rev
Author:   john_doe
Date:     2008-05-12 10:48:56 -0700 (Mon, 12 May 2008)

Log Message:
-----------
Sanity checks in RtZ: o1_PLAYMUS and o1_STOPMUS

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

Modified: scummvm/trunk/engines/made/scriptfuncs_rtz.cpp
===================================================================
--- scummvm/trunk/engines/made/scriptfuncs_rtz.cpp	2008-05-12 17:46:15 UTC (rev 32067)
+++ scummvm/trunk/engines/made/scriptfuncs_rtz.cpp	2008-05-12 17:48:56 UTC (rev 32068)
@@ -280,15 +280,17 @@
 	int16 musicNum = argv[0];
 	if (musicNum > 0) {
 		_xmidiRes = _vm->_res->getXmidi(musicNum);
-		_vm->_music->playXMIDI(_xmidiRes);		
+		if (_xmidiRes)
+			_vm->_music->playXMIDI(_xmidiRes);
 	}
 	return 0;
 }
 
 int16 ScriptFunctionsRtz::o1_STOPMUS(int16 argc, int16 *argv) {
-	if (_vm->_music->isPlaying()) {
+	if (_vm->_music->isPlaying() && _xmidiRes) {
 		_vm->_music->stop();
 		_vm->_res->freeResource(_xmidiRes);
+		_xmidiRes = NULL;
 	}
 	return 0;
 }


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