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

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Mon Feb 15 01:20:53 CET 2010


Revision: 48063
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48063&view=rev
Author:   fingolfin
Date:     2010-02-15 00:20:53 +0000 (Mon, 15 Feb 2010)

Log Message:
-----------
SCI: Remove sound/audio.h include from engine/state.h

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/game.cpp
    scummvm/trunk/engines/sci/engine/ksound.cpp
    scummvm/trunk/engines/sci/engine/state.h
    scummvm/trunk/engines/sci/sound/audio.h
    scummvm/trunk/engines/sci/sound/soundcmd.cpp

Modified: scummvm/trunk/engines/sci/engine/game.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/game.cpp	2010-02-14 19:01:02 UTC (rev 48062)
+++ scummvm/trunk/engines/sci/engine/game.cpp	2010-02-15 00:20:53 UTC (rev 48063)
@@ -37,6 +37,7 @@
 #include "sci/engine/message.h"
 #include "sci/graphics/gui.h"
 #include "sci/graphics/menu.h"
+#include "sci/sound/audio.h"
 #include "sci/sound/music.h"
 
 namespace Sci {

Modified: scummvm/trunk/engines/sci/engine/ksound.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/ksound.cpp	2010-02-14 19:01:02 UTC (rev 48062)
+++ scummvm/trunk/engines/sci/engine/ksound.cpp	2010-02-15 00:20:53 UTC (rev 48063)
@@ -28,6 +28,7 @@
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
 #include "sci/engine/vm.h"		// for Object
+#include "sci/sound/audio.h"
 #include "sci/sound/soundcmd.h"
 
 #include "sound/mixer.h"

Modified: scummvm/trunk/engines/sci/engine/state.h
===================================================================
--- scummvm/trunk/engines/sci/engine/state.h	2010-02-14 19:01:02 UTC (rev 48062)
+++ scummvm/trunk/engines/sci/engine/state.h	2010-02-15 00:20:53 UTC (rev 48063)
@@ -40,7 +40,6 @@
 
 #include "sci/parser/vocabulary.h"
 
-#include "sci/sound/audio.h"
 #ifdef USE_OLD_MUSIC_FUNCTIONS
 #include "sci/sound/iterator/core.h"
 #endif

Modified: scummvm/trunk/engines/sci/sound/audio.h
===================================================================
--- scummvm/trunk/engines/sci/sound/audio.h	2010-02-14 19:01:02 UTC (rev 48062)
+++ scummvm/trunk/engines/sci/sound/audio.h	2010-02-15 00:20:53 UTC (rev 48063)
@@ -27,6 +27,7 @@
 #ifndef SCI_AUDIO_H
 #define SCI_AUDIO_H
 
+#include "sci/engine/vm_types.h"
 #include "sound/mixer.h"
 
 namespace Sci {

Modified: scummvm/trunk/engines/sci/sound/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-02-14 19:01:02 UTC (rev 48062)
+++ scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-02-15 00:20:53 UTC (rev 48063)
@@ -30,6 +30,7 @@
 #endif
 
 #include "common/config-manager.h"
+#include "sci/sound/audio.h"
 #include "sci/sound/music.h"
 #include "sci/sound/soundcmd.h"
 


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




More information about the Scummvm-git-logs mailing list