[Scummvm-cvs-logs] SF.net SVN: scummvm:[47196] scummvm/branches/branch-1-0-0
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Sat Jan 9 07:36:28 CET 2010
Revision: 47196
http://scummvm.svn.sourceforge.net/scummvm/?rev=47196&view=rev
Author: eriktorbjorn
Date: 2010-01-09 06:36:28 +0000 (Sat, 09 Jan 2010)
Log Message:
-----------
Backported fix for bug #2928411, "SWORD1: Macintosh Demo crashes after Intro".
Modified Paths:
--------------
scummvm/branches/branch-1-0-0/NEWS
scummvm/branches/branch-1-0-0/engines/sword1/sound.cpp
Modified: scummvm/branches/branch-1-0-0/NEWS
===================================================================
--- scummvm/branches/branch-1-0-0/NEWS 2010-01-09 03:55:09 UTC (rev 47195)
+++ scummvm/branches/branch-1-0-0/NEWS 2010-01-09 06:36:28 UTC (rev 47196)
@@ -1,6 +1,10 @@
For a more comprehensive changelog for the latest experimental SVN code, see:
http://scummvm.svn.sourceforge.net/viewvc/scummvm/?view=log
+1.0.1 (2010-??-??)
+ Broken Sword 1:
+ - Fixed crash in the Macintosh demo.
+
1.0.0 (2009-11-15)
New Ports:
- Added MotoEZX and MotoMAGX ports.
Modified: scummvm/branches/branch-1-0-0/engines/sword1/sound.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/sword1/sound.cpp 2010-01-09 03:55:09 UTC (rev 47195)
+++ scummvm/branches/branch-1-0-0/engines/sword1/sound.cpp 2010-01-09 06:36:28 UTC (rev 47196)
@@ -221,7 +221,7 @@
void Sound::newScreen(uint32 screen) {
if (_currentCowFile != SwordEngine::_systemVars.currentCD) {
- if (_currentCowFile)
+ if (_cowFile.isOpen())
closeCowSystem();
initCowSystem();
}
@@ -551,6 +551,9 @@
}
void Sound::initCowSystem(void) {
+ 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.
More information about the Scummvm-git-logs
mailing list