From 224704ec8807ebaabc80b12dd9c60b666ffa11df Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Thu, 25 Aug 2016 01:32:12 +0200 Subject: DIRECTOR: Try to simplify uncompressed detection heuristic --- engines/director/frame.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'engines') diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp index 5313103399..7412031245 100644 --- a/engines/director/frame.cpp +++ b/engines/director/frame.cpp @@ -572,14 +572,12 @@ Image::ImageDecoder *Frame::getImageFrom(uint16 spriteId) { debugC(4, kDebugImages, "%d, %d, %d", imgId, w, h); if (true || bc->flags & 0x20) { - int w1 = w + 8 - w % 8 + 8; - debugC(3, kDebugImages, "Disabling compression for %d: %d x %d", imgId, w1, h); + int w1 = w + 16 - w % 16; - if (pic->size() * 8 == w1 * h) + if (pic->size() * 8 == w1 * h) { + debugC(3, kDebugImages, "Disabling compression for %d: %d x %d", imgId, w1, h); img = new BITDDecoder(w1, h, false); - else if (pic->size() * 8 == (w1 + 8) * h) - img = new BITDDecoder(w1 + 8, h, false); - else + } else img = new BITDDecoder(w /*+ 8*/, h, true); } else { img = new BITDDecoder(w, h, true); -- cgit v1.2.3