libAthena/athena
2
0
Fork 0
mirror of https://github.com/libAthena/athena.git synced 2025-06-06 22:53:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Fix build

Browse Source
This commit is contained in:
Phillip Stephens 2014-08-16 18:48:27 -07:00
parent 47054ea881
commit f3e9fb4f70
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Athena.pri
View File

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

4
include/Athena/Utility.hpp
View File

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

4
src/Athena/Utility.cpp
View File

@ -29,7 +29,7 @@ namespace utility
{ {
bool isEmpty(atInt8* buf, atUint32 size) 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 ) atUint16 swapU16(atUint16 val )
@ -73,7 +73,7 @@ atInt64 swap64(atInt64 val)
bool isSystemBigEndian() bool isSystemBigEndian()
{ {
atUint8* test = (atUint8*)"\xFE\xFF"; static atUint8* test = (atUint8*)"\xFE\xFF";
return (*(atUint16*)test == 0xFEFF); return (*(atUint16*)test == 0xFEFF);
} }

4
src/Athena/ZQuestFileReader.cpp
View File

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