[Scummvm-cvs-logs] SF.net SVN: scummvm:[35273] scummvm/trunk/engines/kyra/sound_midi.cpp

[lordhoto at users.sourceforge.net]

Revision: 35273
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35273&view=rev
Author:   lordhoto
Date:     2008-12-07 13:41:00 +0000 (Sun, 07 Dec 2008)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sound_midi.cpp

Modified: scummvm/trunk/engines/kyra/sound_midi.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_midi.cpp	2008-12-07 13:12:09 UTC (rev 35272)
+++ scummvm/trunk/engines/kyra/sound_midi.cpp	2008-12-07 13:41:00 UTC (rev 35273)
@@ -551,12 +551,13 @@
 
 	file += _useC55 ? ".C55" : ".XMI";
 	file.toUppercase();
-	if (!_vm->resource()->exists(file.c_str()))
-		return;
 
 	if (_mFileName == file)
 		return;
 
+	if (!_vm->resource()->exists(file.c_str()))
+		return;
+
 	// When loading a new file we stopp all notes
 	// still running on our own, just to prevent
 	// glitches
@@ -592,12 +593,13 @@
 
 	file += _useC55 ? ".C55" : ".XMI";
 	file.toUppercase();
-	if (!_vm->resource()->exists(file.c_str()))
-		return;
 
 	if (_sFileName == file)
 		return;
 
+	if (!_vm->resource()->exists(file.c_str()))
+		return;
+
 	delete[] _sfxFile;
 
 	uint32 fileSize = 0;


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