From 659e7ed76e010fcfa6c742add172bf96051cb5d8 Mon Sep 17 00:00:00 2001
From: Gregory Montoir
Date: Thu, 24 May 2007 21:19:52 +0000
Subject: sync resource unpacking code of cruise with cine

svn-id: r26933
---
 engines/cruise/overlay.cpp | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

(limited to 'engines/cruise/overlay.cpp')

diff --git a/engines/cruise/overlay.cpp b/engines/cruise/overlay.cpp
index af52f25e16..10e807380a 100644
--- a/engines/cruise/overlay.cpp
+++ b/engines/cruise/overlay.cpp
@@ -111,25 +111,13 @@ int loadOverlay(uint8 *scriptName) {
 	}
 
 	if (volumePtrToFileDescriptor[fileIdx].size + 2 != unpackedSize) {
-		char *tempBuffer;
-		uint16 realUnpackedSize;
 		char *pakedBuffer =
 		    (char *)mallocAndZero(volumePtrToFileDescriptor[fileIdx].
 		    size + 2);
 
 		loadPakedFileToMem(fileIdx, (uint8 *) pakedBuffer);
 
-		realUnpackedSize =
-		    *(int16 *) (pakedBuffer +
-		    volumePtrToFileDescriptor[fileIdx].size - 2);
-		flipShort(&realUnpackedSize);
-
-		tempBuffer = (char *)mallocAndZero(realUnpackedSize);
-
-		decomp((uint8 *) pakedBuffer +
-		    volumePtrToFileDescriptor[fileIdx].size - 4,
-		    (uint8 *) unpackedBuffer + realUnpackedSize,
-		    realUnpackedSize);
+		delphineUnpack((uint8 *)unpackedBuffer, (const uint8 *)pakedBuffer, volumePtrToFileDescriptor[fileIdx].size);
 
 		free(pakedBuffer);
 	} else {
@@ -559,7 +547,6 @@ int loadOverlay(uint8 *scriptName) {
 
 		if (volumePtrToFileDescriptor[fileIdx].size + 2 !=
 		    unpackedSize) {
-			short int realUnpackedSize;
 			char *pakedBuffer =
 			    (char *)
 			    mallocAndZero(volumePtrToFileDescriptor[fileIdx].
@@ -567,15 +554,7 @@ int loadOverlay(uint8 *scriptName) {
 
 			loadPakedFileToMem(fileIdx, (uint8 *) pakedBuffer);
 
-			realUnpackedSize =
-			    *(int16 *) (pakedBuffer +
-			    volumePtrToFileDescriptor[fileIdx].size - 2);
-			flipShort(&realUnpackedSize);
-
-			decomp((uint8 *) pakedBuffer +
-			    volumePtrToFileDescriptor[fileIdx].size - 4,
-			    (uint8 *) unpackedBuffer + realUnpackedSize,
-			    realUnpackedSize);
+			delphineUnpack((uint8 *) unpackedBuffer, (const uint8 *)pakedBuffer, volumePtrToFileDescriptor[fileIdx].size);
 
 			free(pakedBuffer);
 		} else {
-- 
cgit v1.2.3