diff options
Diffstat (limited to 'engines/cine/pal.cpp')
| -rw-r--r-- | engines/cine/pal.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/engines/cine/pal.cpp b/engines/cine/pal.cpp index a5b94d1034..0bb07f25a5 100644 --- a/engines/cine/pal.cpp +++ b/engines/cine/pal.cpp @@ -34,8 +34,6 @@ byte palette256[256 * 3]; uint16 palEntriesCount; -Common::File *palFileHandleP = NULL; - PalEntry *palPtr = NULL; byte paletteBuffer1[16]; @@ -48,8 +46,6 @@ void loadPal(const char *fileName) { strcat(buffer, ".PAL"); - palFileHandle.close(); - if (palPtr) { free(palPtr); palPtr = NULL; @@ -57,9 +53,9 @@ void loadPal(const char *fileName) { palEntriesCount = 0; - palFileHandle.open(buffer); - - assert(palFileHandle.isOpen()); + Common::File palFileHandle; + if (!palFileHandle.open(buffer)) + error("loadPal(): Cannot open file %s", fileName); palEntriesCount = palFileHandle.readUint16LE(); palFileHandle.readUint16LE(); // entry size @@ -71,6 +67,7 @@ void loadPal(const char *fileName) { palFileHandle.read(palPtr[i].pal1, 16); palFileHandle.read(palPtr[i].pal2, 16); } + palFileHandle.close(); } int16 findPaletteFromName(const char *fileName) { |