[Scummvm-cvs-logs] SF.net SVN: scummvm:[54988] scummvm/trunk/engines/mohawk

[fuzzie at users.sourceforge.net]

Revision: 54988
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54988&view=rev
Author:   fuzzie
Date:     2010-12-21 18:16:20 +0000 (Tue, 21 Dec 2010)

Log Message:
-----------
MOHAWK: Remove sound.h include from resource.h

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/livingbooks.cpp
    scummvm/trunk/engines/mohawk/myst.cpp
    scummvm/trunk/engines/mohawk/resource.cpp
    scummvm/trunk/engines/mohawk/resource.h
    scummvm/trunk/engines/mohawk/riven.cpp
    scummvm/trunk/engines/mohawk/video.cpp
    scummvm/trunk/engines/mohawk/video.h

Modified: scummvm/trunk/engines/mohawk/livingbooks.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/livingbooks.cpp	2010-12-21 18:15:56 UTC (rev 54987)
+++ scummvm/trunk/engines/mohawk/livingbooks.cpp	2010-12-21 18:16:20 UTC (rev 54988)
@@ -26,6 +26,7 @@
 #include "mohawk/livingbooks.h"
 #include "mohawk/resource.h"
 #include "mohawk/cursors.h"
+#include "mohawk/sound.h"
 #include "mohawk/video.h"
 
 #include "common/events.h"

Modified: scummvm/trunk/engines/mohawk/myst.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst.cpp	2010-12-21 18:15:56 UTC (rev 54987)
+++ scummvm/trunk/engines/mohawk/myst.cpp	2010-12-21 18:16:20 UTC (rev 54988)
@@ -36,6 +36,7 @@
 #include "mohawk/dialogs.h"
 #include "mohawk/resource.h"
 #include "mohawk/resource_cache.h"
+#include "mohawk/sound.h"
 #include "mohawk/video.h"
 
 // The stacks

Modified: scummvm/trunk/engines/mohawk/resource.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/resource.cpp	2010-12-21 18:15:56 UTC (rev 54987)
+++ scummvm/trunk/engines/mohawk/resource.cpp	2010-12-21 18:16:20 UTC (rev 54988)
@@ -25,6 +25,7 @@
 
 #include "mohawk/resource.h"
 
+#include "common/debug.h"
 #include "common/substream.h"
 #include "common/util.h"
 

Modified: scummvm/trunk/engines/mohawk/resource.h
===================================================================
--- scummvm/trunk/engines/mohawk/resource.h	2010-12-21 18:15:56 UTC (rev 54987)
+++ scummvm/trunk/engines/mohawk/resource.h	2010-12-21 18:16:20 UTC (rev 54988)
@@ -28,8 +28,6 @@
 #include "common/file.h"
 #include "common/str.h"
 
-#include "mohawk/sound.h"
-
 #ifndef MOHAWK_RESOURCE_H
 #define MOHAWK_RESOURCE_H
 

Modified: scummvm/trunk/engines/mohawk/riven.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/riven.cpp	2010-12-21 18:15:56 UTC (rev 54987)
+++ scummvm/trunk/engines/mohawk/riven.cpp	2010-12-21 18:16:20 UTC (rev 54988)
@@ -36,6 +36,7 @@
 #include "mohawk/riven_external.h"
 #include "mohawk/riven_saveload.h"
 #include "mohawk/dialogs.h"
+#include "mohawk/sound.h"
 #include "mohawk/video.h"
 #include "mohawk/console.h"
 

Modified: scummvm/trunk/engines/mohawk/video.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/video.cpp	2010-12-21 18:15:56 UTC (rev 54987)
+++ scummvm/trunk/engines/mohawk/video.cpp	2010-12-21 18:16:20 UTC (rev 54988)
@@ -23,6 +23,7 @@
  *
  */
 
+#include "mohawk/mohawk.h"
 #include "mohawk/resource.h"
 #include "mohawk/video.h"
 

Modified: scummvm/trunk/engines/mohawk/video.h
===================================================================
--- scummvm/trunk/engines/mohawk/video.h	2010-12-21 18:15:56 UTC (rev 54987)
+++ scummvm/trunk/engines/mohawk/video.h	2010-12-21 18:16:20 UTC (rev 54988)
@@ -26,6 +26,7 @@
 #ifndef MOHAWK_VIDEO_H
 #define MOHAWK_VIDEO_H
 
+#include "common/array.h"
 #include "graphics/pixelformat.h"
 
 namespace Graphics {


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