MOHAWK: Cleanup image surface handling

- Renamed ImageData to MohawkSurface
- Added offset x/y fields to MohawkSurface
- The image cache now stores MohawkSurface pointers
- Switched Living Books to 8bpp mode (it requires that in the end anyway)

svn-id: r54468

1 files changed, 4 insertions, 4 deletions

diff --git a/engines/mohawk/bitmap.h b/engines/mohawk/bitmap.h
index 844185035e..13df68738e 100644
--- a/engines/mohawk/bitmap.h
+++ b/engines/mohawk/bitmap.h
@@ -34,7 +34,7 @@
 
 namespace Mohawk {
 
-class ImageData;
+class MohawkSurface;
 
 enum BitmapFormat {
 	kBitsPerPixel1 = 0x0000,
@@ -84,7 +84,7 @@ public:
 	MohawkBitmap();
 	virtual ~MohawkBitmap();
 
-	virtual ImageData *decodeImage(Common::SeekableReadStream *stream);
+	virtual MohawkSurface *decodeImage(Common::SeekableReadStream *stream);
 
 protected:
 	BitmapHeader _header;
@@ -147,7 +147,7 @@ public:
 	MystBitmap() : MohawkBitmap() {}
 	~MystBitmap() {}
 
-	ImageData *decodeImage(Common::SeekableReadStream *stream);
+	MohawkSurface *decodeImage(Common::SeekableReadStream *stream);
 
 protected:
 	byte getBitsPerPixel() { return _info.bitsPerPixel; }
@@ -181,7 +181,7 @@ public:
 	OldMohawkBitmap() : MohawkBitmap() {}
 	~OldMohawkBitmap() {}
 
-	ImageData *decodeImage(Common::SeekableReadStream *stream);
+	MohawkSurface *decodeImage(Common::SeekableReadStream *stream);
 
 protected:
 	byte getBitsPerPixel() { return 8; }