diff options
| author | Vincent Hamm | 2007-12-25 16:37:12 +0000 |
|---|---|---|
| committer | Vincent Hamm | 2007-12-25 16:37:12 +0000 |
| commit | 37d8bed89be174f37aeba1993f724c3889d88d10 (patch) | |
| tree | 9a1575ac352224c8dca7e9f4f3371b8fe0abba81 /engines/cruise/dataLoader.cpp | |
| parent | c10f74411ec9bb1323551a3958eebd58e06c134a (diff) | |
| download | scummvm-rg350-37d8bed89be174f37aeba1993f724c3889d88d10.tar.gz scummvm-rg350-37d8bed89be174f37aeba1993f724c3889d88d10.tar.bz2 scummvm-rg350-37d8bed89be174f37aeba1993f724c3889d88d10.zip | |
Fix cell sorting
Fix palette loading
svn-id: r29985
Diffstat (limited to 'engines/cruise/dataLoader.cpp')
| -rw-r--r-- | engines/cruise/dataLoader.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/cruise/dataLoader.cpp b/engines/cruise/dataLoader.cpp index 4c89c0b93f..f21a3f1c71 100644 --- a/engines/cruise/dataLoader.cpp +++ b/engines/cruise/dataLoader.cpp @@ -42,8 +42,7 @@ void decodeGfxFormat1(dataFileEntry *pCurrentFileEntry) { uint8 *buffer; uint8 *dataPtr = pCurrentFileEntry->subData.ptr; - int spriteSize = - pCurrentFileEntry->height * pCurrentFileEntry->width; + int spriteSize = pCurrentFileEntry->height * pCurrentFileEntry->width; int x = 0; buffer = (uint8 *) malloc(spriteSize); @@ -480,7 +479,7 @@ int loadSetEntry(const char *name, uint8 *ptr, int currentEntryIdx, int currentD filesDatabase[fileIndex].subData.resourceType = 2; decodeGfxFormat1(&filesDatabase[fileIndex]); filesDatabase[fileIndex].subData.index = currentEntryIdx; - filesDatabase[fileIndex].subData.transparency = localBuffer.transparency % 0x10; + filesDatabase[fileIndex].subData.transparency = 0; break; } case 4: |