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

[jvprat at users.sourceforge.net]

Revision: 35656
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35656&view=rev
Author:   jvprat
Date:     2009-01-01 22:49:44 +0000 (Thu, 01 Jan 2009)

Log Message:
-----------
Use the proper samples file name for 11h

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

Modified: scummvm/trunk/engines/groovie/groovie.cpp
===================================================================
--- scummvm/trunk/engines/groovie/groovie.cpp	2009-01-01 22:15:21 UTC (rev 35655)
+++ scummvm/trunk/engines/groovie/groovie.cpp	2009-01-01 22:49:44 UTC (rev 35656)
@@ -94,7 +94,7 @@
 	}
 
 	// Create the music player
-	_musicPlayer = new MusicPlayer(this);
+	_musicPlayer = new MusicPlayer(this, _gameDescription->version == kGroovieT7G ? "fat" : "sample");
 
 	// Load volume levels
 	syncSoundSettings();

Modified: scummvm/trunk/engines/groovie/music.cpp
===================================================================
--- scummvm/trunk/engines/groovie/music.cpp	2009-01-01 22:15:21 UTC (rev 35655)
+++ scummvm/trunk/engines/groovie/music.cpp	2009-01-01 22:49:44 UTC (rev 35656)
@@ -31,7 +31,7 @@
 
 namespace Groovie {
 
-MusicPlayer::MusicPlayer(GroovieEngine *vm) :
+MusicPlayer::MusicPlayer(GroovieEngine *vm, const Common::String &gtlName) :
 	_vm(vm), _midiParser(NULL), _data(NULL), _driver(NULL),
 	_backgroundFileRef(0), _gameVolume(100), _prevCDtrack(0) {
 	// Create the parser
@@ -52,7 +52,7 @@
 	if (driver == MD_ADLIB) {
 		// MIDI through AdLib
 		_musicType = MD_ADLIB;
-		loadTimbres("fat.ad");
+		loadTimbres(gtlName + ".ad");
 
 		// Setup the percussion channel
 		for (unsigned int i = 0; i < _timbres.size(); i++) {
@@ -62,7 +62,7 @@
 	} else if ((driver == MD_MT32) || ConfMan.getBool("native_mt32")) {
 		// MT-32
 		_musicType = MD_MT32;
-		loadTimbres("fat.mt");
+		loadTimbres(gtlName + ".mt");
 	} else {
 		// GM
 		_musicType = 0;

Modified: scummvm/trunk/engines/groovie/music.h
===================================================================
--- scummvm/trunk/engines/groovie/music.h	2009-01-01 22:15:21 UTC (rev 35655)
+++ scummvm/trunk/engines/groovie/music.h	2009-01-01 22:49:44 UTC (rev 35656)
@@ -36,7 +36,7 @@
 
 class MusicPlayer : public MidiDriver {
 public:
-	MusicPlayer(GroovieEngine *vm);
+	MusicPlayer(GroovieEngine *vm, const Common::String &gtlName);
 	~MusicPlayer();
 	void playSong(uint16 fileref);
 	void setBackgroundSong(uint16 fileref);


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