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

[thebluegr at users.sourceforge.net]

Revision: 47464
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47464&view=rev
Author:   thebluegr
Date:     2010-01-23 12:10:31 +0000 (Sat, 23 Jan 2010)

Log Message:
-----------
sfx_init_flags is not used in the new sound code

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/state.cpp
    scummvm/trunk/engines/sci/engine/state.h

Modified: scummvm/trunk/engines/sci/engine/state.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/state.cpp	2010-01-23 12:01:04 UTC (rev 47463)
+++ scummvm/trunk/engines/sci/engine/state.cpp	2010-01-23 12:10:31 UTC (rev 47464)
@@ -35,7 +35,9 @@
 EngineState::EngineState(ResourceManager *res, Kernel *kernel, Vocabulary *voc, SegManager *segMan, SciGui *gui, AudioPlayer *audio)
 : resMan(res), _kernel(kernel), _voc(voc), _segMan(segMan), _gui(gui), _audio(audio), _dirseeker() {
 
+#ifdef USE_OLD_MUSIC_FUNCTIONS
 	sfx_init_flags = 0;
+#endif
 
 	restarting_flags = 0;
 

Modified: scummvm/trunk/engines/sci/engine/state.h
===================================================================
--- scummvm/trunk/engines/sci/engine/state.h	2010-01-23 12:01:04 UTC (rev 47463)
+++ scummvm/trunk/engines/sci/engine/state.h	2010-01-23 12:10:31 UTC (rev 47464)
@@ -149,9 +149,9 @@
 	AudioPlayer *_audio;
 #ifdef USE_OLD_MUSIC_FUNCTIONS
 	SfxState _sound; /**< sound subsystem */
+	int sfx_init_flags; /**< flags the sfx subsystem was initialised with */
 #endif
 	SoundCommandParser *_soundCmd;
-	int sfx_init_flags; /**< flags the sfx subsystem was initialised with */
 
 	byte restarting_flags; /**< Flags used for restarting */
 


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