[Scummvm-cvs-logs] scummvm master -> 50a35193c92cbab0b9824abed2399b400aaba1e3

clone2727 clone2727 at gmail.com
Wed Mar 23 02:21:22 CET 2011


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
bc1c84e6c8 MOHAWK: Rename OldMohawkBitmap to LivingBooksBitmap_v1
50a35193c9 MOHAWK: Remove 'old' from the LB v1 sound function too


Commit: bc1c84e6c8fd94e7043c6af3ec9c3abbb67e0cf2
    https://github.com/scummvm/scummvm/commit/bc1c84e6c8fd94e7043c6af3ec9c3abbb67e0cf2
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2011-03-22T18:13:54-07:00

Commit Message:
MOHAWK: Rename OldMohawkBitmap to LivingBooksBitmap_v1

'Old' is very ambiguous ;)

Changed paths:
    engines/mohawk/bitmap.cpp
    engines/mohawk/bitmap.h
    engines/mohawk/graphics.cpp



diff --git a/engines/mohawk/bitmap.cpp b/engines/mohawk/bitmap.cpp
index 7f02280..1a6024a 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 14b8e75..55b884a 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 19882c4..9b8e586 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);
 }


Commit: 50a35193c92cbab0b9824abed2399b400aaba1e3
    https://github.com/scummvm/scummvm/commit/50a35193c92cbab0b9824abed2399b400aaba1e3
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2011-03-22T18:16:27-07:00

Commit Message:
MOHAWK: Remove 'old' from the LB v1 sound function too

Changed paths:
    engines/mohawk/sound.cpp
    engines/mohawk/sound.h



diff --git a/engines/mohawk/sound.cpp b/engines/mohawk/sound.cpp
index ca642f1..1445754 100644
--- a/engines/mohawk/sound.cpp
+++ b/engines/mohawk/sound.cpp
@@ -90,11 +90,11 @@ Audio::AudioStream *Sound::makeAudioStream(uint16 id, CueList *cueList) {
 		audStream = makeMohawkWaveStream(_vm->getResource(ID_SND, id));
 		break;
 	case GType_LIVINGBOOKSV1:
-		audStream = makeOldMohawkWaveStream(_vm->getResource(ID_WAV, id));
+		audStream = makeLivingBooksWaveStream_v1(_vm->getResource(ID_WAV, id));
 		break;
 	case GType_LIVINGBOOKSV2:
 		if (_vm->getPlatform() == Common::kPlatformMacintosh) {
-			audStream = makeOldMohawkWaveStream(_vm->getResource(ID_WAV, id));
+			audStream = makeLivingBooksWaveStream_v1(_vm->getResource(ID_WAV, id));
 			break;
 		}
 		// fall through
@@ -493,7 +493,7 @@ Audio::AudioStream *Sound::makeMohawkWaveStream(Common::SeekableReadStream *stre
 	return NULL;
 }
 
-Audio::AudioStream *Sound::makeOldMohawkWaveStream(Common::SeekableReadStream *stream) {
+Audio::AudioStream *Sound::makeLivingBooksWaveStream_v1(Common::SeekableReadStream *stream) {
 	uint16 header = stream->readUint16BE();
 	uint16 rate = 0;
 	uint32 size = 0;
diff --git a/engines/mohawk/sound.h b/engines/mohawk/sound.h
index 938f15f..3135b1d 100644
--- a/engines/mohawk/sound.h
+++ b/engines/mohawk/sound.h
@@ -158,7 +158,7 @@ private:
 	byte *_midiData;
 
 	static Audio::AudioStream *makeMohawkWaveStream(Common::SeekableReadStream *stream, CueList *cueList = NULL);
-	static Audio::AudioStream *makeOldMohawkWaveStream(Common::SeekableReadStream *stream);
+	static Audio::AudioStream *makeLivingBooksWaveStream_v1(Common::SeekableReadStream *stream);
 	void initMidi();
 
 	Common::Array<SndHandle> _handles;






More information about the Scummvm-git-logs mailing list