[Scummvm-cvs-logs] scummvm master -> ae4b298bbb41a37a73b0b10eb021d9730bd8b839

[scott-t]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e23bd5b92b GROOVIE: Ensure entire v2 res name is loaded with terminating null
ae4b298bbb GROOVIE: Fix MusicPlayerIOS volume not correctly restoring on new song


Commit: e23bd5b92b3643f0b1ddc3dc9a4aaf4a2203d46d
    https://github.com/scummvm/scummvm/commit/e23bd5b92b3643f0b1ddc3dc9a4aaf4a2203d46d
Author: Scott Thomas (scott_t at users.sourceforge.net)
Date: 2011-06-03T03:17:28-07:00

Commit Message:
GROOVIE: Ensure entire v2 res name is loaded with terminating null

Changed paths:
    engines/groovie/resource.cpp



diff --git a/engines/groovie/resource.cpp b/engines/groovie/resource.cpp
index 05b43b7..c26f04d 100644
--- a/engines/groovie/resource.cpp
+++ b/engines/groovie/resource.cpp
@@ -169,7 +169,7 @@ bool ResMan_t7g::getResInfo(uint32 fileRef, ResInfo &resInfo) {
 		error("Groovie::Resource: Invalid resource number: 0x%04X (%s)", resNum, rlFileName.c_str());
 	}
 
-	// Read the resource name (just for debugging purposes)
+	// Read the resource name
 	char resname[13];
 	rlFile->read(resname, 12);
 	resname[12] = 0;
@@ -240,7 +240,7 @@ uint32 ResMan_v2::getRef(Common::String name, Common::String scriptname) {
 		// Test whether it's the resource we're searching
 		Common::String resname(readname, 18);
 		if (resname.hasPrefix(name.c_str())) {
-			debugC(2, kGroovieDebugResource | kGroovieDebugAll, "Groovie::Resource: Resource %12s matches %s", readname, name.c_str());
+			debugC(2, kGroovieDebugResource | kGroovieDebugAll, "Groovie::Resource: Resource %18s matches %s", readname, name.c_str());
 			found = true;
 		}
 	}
@@ -279,10 +279,11 @@ bool ResMan_v2::getResInfo(uint32 fileRef, ResInfo &resInfo) {
 	resInfo.size = rlFile.readUint32LE();
 	resInfo.gjd = rlFile.readUint16LE();
 
-	// Read the resource name (just for debugging purposes)
-	char resname[12];
-	rlFile.read(resname, 12);
-	debugC(2, kGroovieDebugResource | kGroovieDebugAll, "Groovie::Resource: Resource name: %12s", resname);
+	// Read the resource name
+	char resname[19];
+	resname[18] = 0;
+	rlFile.read(resname, 18);
+	debugC(2, kGroovieDebugResource | kGroovieDebugAll, "Groovie::Resource: Resource name: %18s", resname);
 	resInfo.filename = resname;
 
 	// 6 padding bytes? (it looks like they're always 0)


Commit: ae4b298bbb41a37a73b0b10eb021d9730bd8b839
    https://github.com/scummvm/scummvm/commit/ae4b298bbb41a37a73b0b10eb021d9730bd8b839
Author: Scott Thomas (scott_t at users.sourceforge.net)
Date: 2011-06-03T03:19:56-07:00

Commit Message:
GROOVIE: Fix MusicPlayerIOS volume not correctly restoring on new song

Changed paths:
    engines/groovie/music.cpp



diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp
index 9a3903e..33fc986 100644
--- a/engines/groovie/music.cpp
+++ b/engines/groovie/music.cpp
@@ -845,6 +845,9 @@ bool MusicPlayerIOS::load(uint32 fileref, bool loop) {
 	if (loop)
 		audStream = Audio::makeLoopingAudioStream((Audio::RewindableAudioStream *)audStream, 0);
 
+	// MIDI player handles volume reset on load, IOS player doesn't - force update here
+	updateVolume();
+
 	// Play!
 	_vm->_system->getMixer()->playStream(Audio::Mixer::kMusicSoundType, &_handle, audStream); 
 	return true;