Capitalize Makefiles.

[quix0rs-blobwars.git] / src / CPak.cpp

diff --git a/src/CPak.cpp b/src/CPak.cpp
index a6811d33f1300ce000ecf7f8549f0dfbd29a92b1..1872fd930bf9df9330f3a6ae603cf3d8b78b0fdc 100644 (file)
--- a/src/CPak.cpp
+++ b/src/CPak.cpp
@@ -1,5 +1,6 @@
 /*
-Copyright (C) 2004 Parallel Realities
+Copyright (C) 2004-2011 Parallel Realities
+Copyright (C) 2011-2015 Perpendicular Dimensions
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -35,15 +36,8 @@ Pak::Pak()
 
 Pak::~Pak()
 {
-       if (input != NULL)
-               delete[] input;
-               
-       input = NULL;
-       
-       if (fd != NULL)
-               delete[] fd;
-       
-       fd = NULL;
+       delete[] input;
+       delete[] fd;
 }
 
 void Pak::showPakErrorAndExit()
@@ -73,8 +67,16 @@ void Pak::setPakFile(const char *pakFilename)
        }
 
        fseek(pak, (-sizeof(Uint32)) * 2, SEEK_END);
-       fread(&listPos, sizeof(Uint32), 1, pak);
-       fread(&numberOfFiles, sizeof(Uint32), 1, pak);
+       if (fread(&listPos, sizeof(Uint32), 1, pak) != 1)
+       {
+               fclose(pak);
+               showPakErrorAndExit();
+       }
+       if (fread(&numberOfFiles, sizeof(Uint32), 1, pak) != 1)
+       {
+               fclose(pak);
+               showPakErrorAndExit();
+       }
        
        debug(("Pak : File list resides at %d\n", (int)listPos));
        debug(("Pak : Number of files are %d\n", (int)numberOfFiles));
@@ -131,17 +133,17 @@ bool Pak::unpack(const char *filename, unsigned char **buffer)
        
        fseek(pak, currentFile->location, SEEK_SET);
 
-       if (input != NULL)
-       {
-               delete[] input;
-       }
-
+       delete[] input;
        input = NULL;
        
        input = new unsigned char[(int)(currentFile->cSize * 1.01) + 12];
        *buffer = new unsigned char[currentFile->fSize + 1];
 
-       fread(input, 1, currentFile->cSize, pak);
+       if (fread(input, 1, currentFile->cSize, pak) != currentFile->cSize)
+       {
+               fclose(pak);
+               showPakErrorAndExit();
+       }
        
        uLongf fSize = (uLongf)currentFile->fSize;
        
@@ -150,9 +152,7 @@ bool Pak::unpack(const char *filename, unsigned char **buffer)
 
        fclose(pak);
        
-       if (input != NULL)
-               delete[] input;
-
+       delete[] input;
        input = NULL;
        
        debug(("Pak : Unpack %s...Done\n", filename));
@@ -162,14 +162,6 @@ bool Pak::unpack(const char *filename, unsigned char **buffer)
 
 bool Pak::fileExists(const char *filename)
 {
-       unsigned int hashcode = 0;
-       unsigned int length = strlen(filename);
-       
-       for (unsigned int i = 0 ; i < length ; i++)
-       {
-               hashcode = hashcode + (filename[i] * 31 ^ (length - i));
-       }
-       
        for (unsigned int i = 0 ; i < numberOfFiles ; i++)
        {
                if (strcmp(fd[i].filename, filename) == 0)
@@ -181,7 +173,7 @@ bool Pak::fileExists(const char *filename)
        return false;
 }
 
-unsigned int Pak::getUncompressedSize()
+unsigned int Pak::getUncompressedSize() const
 {
        return (unsigned int)currentFile->fSize;
 }