* Fix build

Athena.pri

@@ -45,7 +45,7 @@ SOURCES += \
     $$PWD/src/sha1.cpp \
     $$PWD/src/aes.c \
     $$PWD/src/lzo.c \
-    Athena/src/Athena/PHYSFSFileReader.cpp
+    $$PWD/src/Athena/PHYSFSFileReader.cpp
 win32:SOURCES += $$PWD/src/win32_largefilewrapper.c
 
 HEADERS += \

include/Athena/Utility.hpp

@@ -40,7 +40,11 @@ double  swapDouble(double val);
 
 bool isSystemBigEndian();
 
+<<<<<<< Updated upstream
 void fillRandom(atUint8 * rndArea, atUint64 count);
+=======
+void fillRandom(atUint8 * rndArea, atUint8 count);
+>>>>>>> Stashed changes
 
 std::vector<std::string> split(const std::string &s, char delim);
 std::string join(const std::vector<std::string>& elems, const std::string& delims);

src/Athena/Utility.cpp

@@ -29,7 +29,7 @@ namespace utility
 {
 bool isEmpty(atInt8* buf, atUint32 size)
 {
-    return buf[0] == 0 && !memcmp(buf, buf + 1, size - 1);
+    return !memcmp(buf, buf + 1, size - 1);
 }
 
 atUint16 swapU16(atUint16 val )
@@ -73,7 +73,7 @@ atInt64 swap64(atInt64 val)
 
 bool isSystemBigEndian()
 {
-    atUint8* test = (atUint8*)"\xFE\xFF";
+    static atUint8* test = (atUint8*)"\xFE\xFF";
     return (*(atUint16*)test == 0xFEFF);
 }
 

src/Athena/ZQuestFileReader.cpp

@@ -46,7 +46,7 @@ ZQuestFile *ZQuestFileReader::read()
     ZQuestFile::Game game = ZQuestFile::NoGame;
     std::string gameString;
     atUint16 BOM;
-    atUint32 checksum;
+    atUint32 checksum = 0;
     atUint8* data;
 
     magic = base::readUint32();
@@ -81,7 +81,6 @@ ZQuestFile *ZQuestFileReader::read()
     {
         game = (ZQuestFile::Game)base::readUint32();
         BOM = base::readUint16();
-        std::cerr << "Test" << std::endl;
         base::seek(0x0A);
     }
 
@@ -110,7 +109,6 @@ ZQuestFile *ZQuestFileReader::read()
         {
             delete[] dst;
             delete[] data;
-            // TODO: Make proper exception
             THROW_INVALID_DATA_EXCEPTION("Error decompressing data");
         }