[Scummvm-cvs-logs] SF.net SVN: scummvm:[38284] scummvm/trunk/engines/groovie

[spookypeanut at users.sourceforge.net]

Revision: 38284
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38284&view=rev
Author:   spookypeanut
Date:     2009-02-15 19:52:44 +0000 (Sun, 15 Feb 2009)

Log Message:
-----------
T7G: Fix for #2511456. Volume is now only reset to 100 on playing a new track, and the background track starts on beginning of input loop (not at end of main track).

Modified Paths:
--------------
    scummvm/trunk/engines/groovie/music.cpp
    scummvm/trunk/engines/groovie/script.cpp

Modified: scummvm/trunk/engines/groovie/music.cpp
===================================================================
--- scummvm/trunk/engines/groovie/music.cpp	2009-02-15 19:45:36 UTC (rev 38283)
+++ scummvm/trunk/engines/groovie/music.cpp	2009-02-15 19:52:44 UTC (rev 38284)
@@ -95,6 +95,8 @@
 void MusicPlayer::playSong(uint16 fileref) {
 	Common::StackLock lock(_mutex);
 
+	_fadingEndVolume = 100;
+	_gameVolume = 100;
 	// Play the referenced file once
 	play(fileref, false);
 }
@@ -185,7 +187,6 @@
 void MusicPlayer::endTrack() {
 	debugC(3, kGroovieDebugMIDI | kGroovieDebugAll, "Groovie::Music: endTrack()");
 	unload();
-	startBackground();
 }
 
 void MusicPlayer::applyFading() {
@@ -207,7 +208,6 @@
 		// If we were fading to 0, stop the playback and restore the volume
 		if (_fadingEndVolume == 0) {
 			debugC(1, kGroovieDebugMIDI | kGroovieDebugAll, "Groovie::Music: Faded to zero: end of song. _fadingEndVolume set to 100");
-			_fadingEndVolume = 100;
 			unload();
 		}
 	}
@@ -239,7 +239,6 @@
 
 	// Set the looping option
 	_midiParser->property(MidiParser::mpAutoLoop, loop);
-	_gameVolume = 100;
 
 	_isPlaying = true;
 	// Load the new file

Modified: scummvm/trunk/engines/groovie/script.cpp
===================================================================
--- scummvm/trunk/engines/groovie/script.cpp	2009-02-15 19:45:36 UTC (rev 38283)
+++ scummvm/trunk/engines/groovie/script.cpp	2009-02-15 19:52:44 UTC (rev 38284)
@@ -567,7 +567,7 @@
 	_bitflags |= 1 << 5;
 }
 
-void Script::o_inputloopstart() {
+void Script::o_inputloopstart() {	//0x0B
 	debugScript(5, true, "Input loop start");
 
 	// Reset the input action and the mouse cursor
@@ -584,6 +584,8 @@
 	// Save the current pressed character for the whole loop
 	_kbdChar = _eventKbdChar;
 	_eventKbdChar = 0;
+
+	_vm->_musicPlayer->startBackground();
 }
 
 void Script::o_keyboardaction() {


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