[Scummvm-git-logs] scummvm master -> 4b02ad2e31cc2746a9d683a053f234dad6654f4c

criezy criezy at scummvm.org
Mon Sep 7 00:12:39 UTC 2020


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

Summary:
4b02ad2e31 MOHAWK: Fix crash starting Living Book games


Commit: 4b02ad2e31cc2746a9d683a053f234dad6654f4c
    https://github.com/scummvm/scummvm/commit/4b02ad2e31cc2746a9d683a053f234dad6654f4c
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2020-09-07T01:10:39+01:00

Commit Message:
MOHAWK: Fix crash starting Living Book games

This was a regression from commit cd7b892 MOHAWK: Fix mess with
stream pointers casting.

Changed paths:
    engines/mohawk/livingbooks_graphics.cpp


diff --git a/engines/mohawk/livingbooks_graphics.cpp b/engines/mohawk/livingbooks_graphics.cpp
index d672967b38..514f5fb27f 100644
--- a/engines/mohawk/livingbooks_graphics.cpp
+++ b/engines/mohawk/livingbooks_graphics.cpp
@@ -50,7 +50,7 @@ LBGraphics::~LBGraphics() {
 
 MohawkSurface *LBGraphics::decodeImage(uint16 id) {
 	if (_vm->isPreMohawk())
-		return _bmpDecoderLB->decodeImage(_vm->wrapStreamEndian(ID_BMAP, id));
+		return _bmpDecoderLB->decodeImageLB(_vm->wrapStreamEndian(ID_BMAP, id));
 
 	return _bmpDecoder->decodeImage(_vm->getResource(ID_TBMP, id));
 }




More information about the Scummvm-git-logs mailing list