[Scummvm-cvs-logs] SF.net SVN: scummvm:[47171] scummvm/trunk/engines/sword1/sound.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 47171
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47171&view=rev
Author:   eriktorbjorn
Date:     2010-01-08 19:58:47 +0000 (Fri, 08 Jan 2010)

Log Message:
-----------
This should fix bug #2928411, "SWORD1: Macintosh Demo crashes after Intro".

Modified Paths:
--------------
    scummvm/trunk/engines/sword1/sound.cpp

Modified: scummvm/trunk/engines/sword1/sound.cpp
===================================================================
--- scummvm/trunk/engines/sword1/sound.cpp	2010-01-08 18:56:12 UTC (rev 47170)
+++ scummvm/trunk/engines/sword1/sound.cpp	2010-01-08 19:58:47 UTC (rev 47171)
@@ -222,7 +222,7 @@
 
 void Sound::newScreen(uint32 screen) {
 	if (_currentCowFile != SwordEngine::_systemVars.currentCD) {
-		if (_currentCowFile)
+		if (_cowFile.isOpen())
 			closeCowSystem();
 		initCowSystem();
 	}
@@ -545,6 +545,9 @@
 }
 
 void Sound::initCowSystem() {
+	if (SwordEngine::_systemVars.currentCD == 0)
+		return;
+
 	char cowName[25];
 	/* look for speech1/2.clu in the data dir
 	   and speech/speech.clu (running from cd or using cd layout)


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