diff options
| author | Gregory Montoir | 2007-05-24 21:19:52 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2007-05-24 21:19:52 +0000 |
| commit | 659e7ed76e010fcfa6c742add172bf96051cb5d8 (patch) | |
| tree | 941a1aa65467b763e8c317723dc8c8d7b1d68b8c /engines/cruise/overlay.cpp | |
| parent | 0c22443ed680a714a2ffd497ca3d6f53722620dc (diff) | |
| download | scummvm-rg350-659e7ed76e010fcfa6c742add172bf96051cb5d8.tar.gz scummvm-rg350-659e7ed76e010fcfa6c742add172bf96051cb5d8.tar.bz2 scummvm-rg350-659e7ed76e010fcfa6c742add172bf96051cb5d8.zip | |
sync resource unpacking code of cruise with cine
svn-id: r26933
Diffstat (limited to 'engines/cruise/overlay.cpp')
| -rw-r--r-- | engines/cruise/overlay.cpp | 25 |
1 files changed, 2 insertions, 23 deletions
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 { |