luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Drop obsolete configuration macros

Browse Source
This commit is contained in:
numzero
2023-02-20 00:55:45 +03:00
parent 5a2b807890
commit 67f852be57
31 changed files with 30 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/Irrlicht/CZipReader.cpp
View File

@@ -7,16 +7,12 @@
#include "os.h"
#ifdef __IRR_COMPILE_WITH_ZIP_ARCHIVE_LOADER_
#include "CFileList.h"
#include "CReadFile.h"
#include "coreutil.h"
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_ZLIB_
#include <zlib.h> // use system lib
#endif
#include <zlib.h> // use system lib
namespace irr
{
@@ -464,8 +460,6 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
}
case 8:
{
#ifdef _IRR_COMPILE_WITH_ZLIB_
const u32 uncompressedSize = e.header.DataDescriptor.UncompressedSize;
c8* pBuf = new c8[ uncompressedSize ];
if (!pBuf)
@@ -531,10 +525,6 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
}
else
return FileSystem->createMemoryReadFile(pBuf, uncompressedSize, Files[index].FullName, true);
#else
return 0; // zlib not compiled, we cannot decompress the data.
#endif
}
case 12:
{
@@ -560,5 +550,3 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
} // end namespace io
} // end namespace irr
#endif // __IRR_COMPILE_WITH_ZIP_ARCHIVE_LOADER_