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

[fuzzie at users.sourceforge.net]

Revision: 54670
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54670&view=rev
Author:   fuzzie
Date:     2010-11-30 09:04:47 +0000 (Tue, 30 Nov 2010)

Log Message:
-----------
MOHAWK: don't include livingbooks.h from graphics.h

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/bitmap.cpp
    scummvm/trunk/engines/mohawk/graphics.cpp
    scummvm/trunk/engines/mohawk/graphics.h
    scummvm/trunk/engines/mohawk/riven.cpp

Modified: scummvm/trunk/engines/mohawk/bitmap.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/bitmap.cpp	2010-11-30 09:03:22 UTC (rev 54669)
+++ scummvm/trunk/engines/mohawk/bitmap.cpp	2010-11-30 09:04:47 UTC (rev 54670)
@@ -29,6 +29,7 @@
 #include "common/util.h"
 #include "common/endian.h"
 #include "common/memstream.h"
+#include "common/substream.h"
 #include "common/system.h"
 
 namespace Mohawk {

Modified: scummvm/trunk/engines/mohawk/graphics.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/graphics.cpp	2010-11-30 09:03:22 UTC (rev 54669)
+++ scummvm/trunk/engines/mohawk/graphics.cpp	2010-11-30 09:04:47 UTC (rev 54670)
@@ -27,7 +27,10 @@
 #include "mohawk/graphics.h"
 #include "mohawk/myst.h"
 #include "mohawk/riven.h"
+#include "mohawk/livingbooks.h"
 
+#include "common/substream.h"
+
 #include "engines/util.h"
 
 #include "graphics/primitives.h"

Modified: scummvm/trunk/engines/mohawk/graphics.h
===================================================================
--- scummvm/trunk/engines/mohawk/graphics.h	2010-11-30 09:03:22 UTC (rev 54669)
+++ scummvm/trunk/engines/mohawk/graphics.h	2010-11-30 09:04:47 UTC (rev 54670)
@@ -27,7 +27,6 @@
 #define MOHAWK_GRAPHICS_H
 
 #include "mohawk/bitmap.h"
-#include "mohawk/livingbooks.h"
 
 #include "common/file.h"
 #include "common/hashmap.h"
@@ -38,6 +37,7 @@
 
 class MohawkEngine_Myst;
 class MohawkEngine_Riven;
+class MohawkEngine_LivingBooks;
 class MohawkBitmap;
 class MystBitmap;
 

Modified: scummvm/trunk/engines/mohawk/riven.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/riven.cpp	2010-11-30 09:03:22 UTC (rev 54669)
+++ scummvm/trunk/engines/mohawk/riven.cpp	2010-11-30 09:04:47 UTC (rev 54670)
@@ -37,6 +37,7 @@
 #include "mohawk/riven_saveload.h"
 #include "mohawk/dialogs.h"
 #include "mohawk/video.h"
+#include "mohawk/console.h"
 
 namespace Mohawk {
 


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