MOHAWK: Rename OldMohawkBitmap to LivingBooksBitmap_v1

'Old' is very ambiguous ;)

3 files changed, 7 insertions, 7 deletions

diff --git a/engines/mohawk/bitmap.cpp b/engines/mohawk/bitmap.cpp
index 7f022803ed..1a6024aa45 100644
--- a/engines/mohawk/bitmap.cpp
+++ b/engines/mohawk/bitmap.cpp
@@ -721,7 +721,7 @@ MohawkSurface *MystBitmap::decodeImage(Common::SeekableReadStream* stream) {
 	return new MohawkSurface(surface, palData);
 }
 
-MohawkSurface *OldMohawkBitmap::decodeImage(Common::SeekableReadStream *stream) {
+MohawkSurface *LivingBooksBitmap_v1::decodeImage(Common::SeekableReadStream *stream) {
 	Common::SeekableSubReadStreamEndian *endianStream = (Common::SeekableSubReadStreamEndian *)stream;
 
 	// 12 bytes header for the image
@@ -756,10 +756,10 @@ MohawkSurface *OldMohawkBitmap::decodeImage(Common::SeekableReadStream *stream)
 		_data = decompressLZ(stream, uncompressedSize);
 
 		if (endianStream->pos() != endianStream->size())
-			error("OldMohawkBitmap decompression failed");
+			error("LivingBooksBitmap_v1 decompression failed");
 	} else {
 		if ((_header.format & 0xf0) != 0)
-			error("Tried to use unknown OldMohawkBitmap compression (format %02x)", _header.format & 0xf0);
+			error("Tried to use unknown LivingBooksBitmap_v1 compression (format %02x)", _header.format & 0xf0);
 
 		// This is so nasty on so many levels. The original Windows LZ decompressor for the
 		// Living Books v1 games had knowledge of the underlying RLE8 data. While going
diff --git a/engines/mohawk/bitmap.h b/engines/mohawk/bitmap.h
index 14b8e75327..55b884a8d6 100644
--- a/engines/mohawk/bitmap.h
+++ b/engines/mohawk/bitmap.h
@@ -181,10 +181,10 @@ private:
 	} _info;
 };
 
-class OldMohawkBitmap : public MohawkBitmap {
+class LivingBooksBitmap_v1 : public MohawkBitmap {
 public:
-	OldMohawkBitmap() : MohawkBitmap() {}
-	~OldMohawkBitmap() {}
+	LivingBooksBitmap_v1() : MohawkBitmap() {}
+	~LivingBooksBitmap_v1() {}
 
 	MohawkSurface *decodeImage(Common::SeekableReadStream *stream);
 
diff --git a/engines/mohawk/graphics.cpp b/engines/mohawk/graphics.cpp
index 19882c4f1c..9b8e5864b4 100644
--- a/engines/mohawk/graphics.cpp
+++ b/engines/mohawk/graphics.cpp
@@ -1031,7 +1031,7 @@ void RivenGraphics::updateCredits() {
 }
 
 LBGraphics::LBGraphics(MohawkEngine_LivingBooks *vm, uint16 width, uint16 height) : GraphicsManager(), _vm(vm) {
-	_bmpDecoder = _vm->isPreMohawk() ? new OldMohawkBitmap() : new MohawkBitmap();
+	_bmpDecoder = _vm->isPreMohawk() ? new LivingBooksBitmap_v1() : new MohawkBitmap();
 
 	initGraphics(width, height, true);
 }