[Scummvm-cvs-logs] SF.net SVN: scummvm:[46793] scummvm/trunk/engines/sci/sfx

[thebluegr at users.sourceforge.net]

Revision: 46793
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46793&view=rev
Author:   thebluegr
Date:     2009-12-31 08:55:13 +0000 (Thu, 31 Dec 2009)

Log Message:
-----------
SCI/new music code: removed some hacks

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sfx/music.cpp
    scummvm/trunk/engines/sci/sfx/music.h
    scummvm/trunk/engines/sci/sfx/soundcmd.cpp

Modified: scummvm/trunk/engines/sci/sfx/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/music.cpp	2009-12-31 08:30:30 UTC (rev 46792)
+++ scummvm/trunk/engines/sci/sfx/music.cpp	2009-12-31 08:55:13 UTC (rev 46793)
@@ -37,15 +37,13 @@
 
 namespace Sci {
 
-SciMusic::SciMusic(SciVersion soundVersion)
-	: _soundVersion(soundVersion), _soundOn(true), _inCriticalSection(false) {
+SciMusic::SciMusic(ResourceManager *resMan, SegManager *segMan, SciVersion soundVersion)
+	: _resMan(resMan), _segMan(segMan), _soundVersion(soundVersion),
+	  _soundOn(true), _inCriticalSection(false) {
 
 	// Reserve some space in the playlist, to avoid expensive insertion
 	// operations
 	_playList.reserve(10);
-
-	_segMan = ((SciEngine *)g_engine)->getEngineState()->_segMan;	// HACK
-	_resMan = ((SciEngine *)g_engine)->getEngineState()->resMan;	// HACK
 }
 
 SciMusic::~SciMusic() {

Modified: scummvm/trunk/engines/sci/sfx/music.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/music.h	2009-12-31 08:30:30 UTC (rev 46792)
+++ scummvm/trunk/engines/sci/sfx/music.h	2009-12-31 08:55:13 UTC (rev 46793)
@@ -112,7 +112,7 @@
 {
 
 public:
-	SciMusic(SciVersion soundVersion);
+	SciMusic(ResourceManager *resMan, SegManager *segMan, SciVersion soundVersion);
 	~SciMusic();
 
 	void init();

Modified: scummvm/trunk/engines/sci/sfx/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2009-12-31 08:30:30 UTC (rev 46792)
+++ scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2009-12-31 08:55:13 UTC (rev 46793)
@@ -134,7 +134,7 @@
 #endif
 
 	#ifndef USE_OLD_MUSIC_FUNCTIONS
-		_music = new SciMusic(_soundVersion);
+		_music = new SciMusic(_resMan, _segMan, _soundVersion);
 		_music->init();
 	#endif
 


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