From f8052bb650719b8a716e686e6a08ae75b513a903 Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Thu, 8 Feb 2007 23:37:17 +0000 Subject: Convert planar images, only when required for drawing. svn-id: r25433 --- engines/agos/res.cpp | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) (limited to 'engines/agos/res.cpp') diff --git a/engines/agos/res.cpp b/engines/agos/res.cpp index cb25e79c12..a4d003b29a 100644 --- a/engines/agos/res.cpp +++ b/engines/agos/res.cpp @@ -718,28 +718,13 @@ void AGOSEngine::loadVGAVideoFile(uint id, uint type) { error("loadVGAVideoFile: Read failed"); dstSize = READ_BE_UINT32(srcBuffer + srcSize - 4); - if (type == 2) { - dst = (byte *)malloc(dstSize); - decrunchFile(srcBuffer, dst, srcSize); - convertAmiga(dst, dstSize); - free(dst); - } else { - dst = allocBlock (dstSize + extraBuffer); - decrunchFile(srcBuffer, dst, srcSize); - } + dst = allocBlock (dstSize + extraBuffer); + decrunchFile(srcBuffer, dst, srcSize); free(srcBuffer); } else { - if (getGameId() == GID_SIMON1CD32 && type == 2) { - dst = (byte *)malloc(dstSize); - if (in.read(dst, dstSize) != dstSize) - error("loadVGAVideoFile: Read failed"); - convertAmiga(dst, dstSize); - free(dst); - } else { - dst = allocBlock(dstSize + extraBuffer); - if (in.read(dst, dstSize) != dstSize) - error("loadVGAVideoFile: Read failed"); - } + dst = allocBlock(dstSize + extraBuffer); + if (in.read(dst, dstSize) != dstSize) + error("loadVGAVideoFile: Read failed"); } in.close(); } else { -- cgit v1.2.3