[Scummvm-cvs-logs] SF.net SVN: scummvm:[44193] scummvm/branches/branch-1-0-0

[eriktorbjorn at users.sourceforge.net]

Revision: 44193
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44193&view=rev
Author:   eriktorbjorn
Date:     2009-09-19 09:27:41 +0000 (Sat, 19 Sep 2009)

Log Message:
-----------
Backported fix for Broken Sword 1 bug #2847910, "Loss of background audio
loop". I've played through the entire game without any problems, and the sound
effects it adds all make sense even though some of them are hard to make out.

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/NEWS
    scummvm/branches/branch-1-0-0/engines/sword1/control.cpp
    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	2009-09-19 07:52:13 UTC (rev 44192)
+++ scummvm/branches/branch-1-0-0/NEWS	2009-09-19 09:27:41 UTC (rev 44193)
@@ -11,6 +11,9 @@
  AGOS:
    - Fixed load/save code for PC version of Waxworks.
 
+ Broken Sword 1:
+   - Fixed missing background sound effects in some rooms.
+
  CinE:
    - Fixed crashes with Future Wars and Operation Stealth demos.
 

Modified: scummvm/branches/branch-1-0-0/engines/sword1/control.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/sword1/control.cpp	2009-09-19 07:52:13 UTC (rev 44192)
+++ scummvm/branches/branch-1-0-0/engines/sword1/control.cpp	2009-09-19 09:27:41 UTC (rev 44193)
@@ -416,7 +416,10 @@
 	_system->copyRectToScreen(_screenBuf, 640, 0, 0, 640, 480);
 	free(_screenBuf);
 	_mouse->controlPanel(false);
-	_music->startMusic(Logic::_scriptVars[CURRENT_MUSIC], 1);
+	if (retVal == CONTROL_NOTHING_DONE) {
+		_music->startMusic(Logic::_scriptVars[CURRENT_MUSIC], 1);
+		_sound->newScreen(Logic::_scriptVars[SCREEN]);
+	}
 	_panelShown = false;
 	return retVal;
 }

Modified: scummvm/branches/branch-1-0-0/engines/sword1/sound.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/sword1/sound.cpp	2009-09-19 07:52:13 UTC (rev 44192)
+++ scummvm/branches/branch-1-0-0/engines/sword1/sound.cpp	2009-09-19 09:27:41 UTC (rev 44193)
@@ -225,6 +225,16 @@
 			closeCowSystem();
 		initCowSystem();
 	}
+
+	// Start the room's looping sounds.
+	for (uint16 cnt = 0; cnt < TOTAL_FX_PER_ROOM; cnt++) {
+		uint16 fxNo = _roomsFixedFx[screen][cnt];
+		if (fxNo) {
+			if (_fxList[fxNo].type == FX_LOOP)
+				addToQueue(fxNo);
+		} else
+			break;
+	}
 }
 
 void Sound::quitScreen(void) {


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