diff options
| author | Alyssa Milburn | 2010-11-30 09:04:47 +0000 |
|---|---|---|
| committer | Alyssa Milburn | 2010-11-30 09:04:47 +0000 |
| commit | c34410d49dbb32baa9b8c06ef24c1fbef4c420d6 (patch) | |
| tree | 586d49707b1fc0fb36cd9d7bd00a792b66c8d977 /engines/mohawk | |
| parent | b43a07934f47d9bc130f67b46dfcca5d3e0df0a3 (diff) | |
| download | scummvm-rg350-c34410d49dbb32baa9b8c06ef24c1fbef4c420d6.tar.gz scummvm-rg350-c34410d49dbb32baa9b8c06ef24c1fbef4c420d6.tar.bz2 scummvm-rg350-c34410d49dbb32baa9b8c06ef24c1fbef4c420d6.zip | |
MOHAWK: don't include livingbooks.h from graphics.h
svn-id: r54670
Diffstat (limited to 'engines/mohawk')
| -rw-r--r-- | engines/mohawk/bitmap.cpp | 1 | ||||
| -rw-r--r-- | engines/mohawk/graphics.cpp | 3 | ||||
| -rw-r--r-- | engines/mohawk/graphics.h | 2 | ||||
| -rw-r--r-- | engines/mohawk/riven.cpp | 1 |
4 files changed, 6 insertions, 1 deletions
diff --git a/engines/mohawk/bitmap.cpp b/engines/mohawk/bitmap.cpp index 73b21d14ec..6e829be477 100644 --- a/engines/mohawk/bitmap.cpp +++ b/engines/mohawk/bitmap.cpp @@ -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 { diff --git a/engines/mohawk/graphics.cpp b/engines/mohawk/graphics.cpp index fad60445b4..bcb3e44148 100644 --- a/engines/mohawk/graphics.cpp +++ b/engines/mohawk/graphics.cpp @@ -27,6 +27,9 @@ #include "mohawk/graphics.h" #include "mohawk/myst.h" #include "mohawk/riven.h" +#include "mohawk/livingbooks.h" + +#include "common/substream.h" #include "engines/util.h" diff --git a/engines/mohawk/graphics.h b/engines/mohawk/graphics.h index 7fa4404e12..77268d006f 100644 --- a/engines/mohawk/graphics.h +++ b/engines/mohawk/graphics.h @@ -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 @@ namespace Mohawk { class MohawkEngine_Myst; class MohawkEngine_Riven; +class MohawkEngine_LivingBooks; class MohawkBitmap; class MystBitmap; diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp index 45b000ec5f..9f1ad7d506 100644 --- a/engines/mohawk/riven.cpp +++ b/engines/mohawk/riven.cpp @@ -37,6 +37,7 @@ #include "mohawk/riven_saveload.h" #include "mohawk/dialogs.h" #include "mohawk/video.h" +#include "mohawk/console.h" namespace Mohawk { |