ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove wad support

Browse Source
This commit is contained in:
Vincent Lejeune 2015-01-16 19:07:21 +01:00
parent 184b52966e
commit a5230f68da
5 changed files with 1 additions and 448 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/irrlicht/CMakeLists.txt
View File

@ -75,7 +75,6 @@ source/Irrlicht/CSceneNodeAnimatorTexture.cpp
source/Irrlicht/COpenGLTexture.cpp
source/Irrlicht/COctreeSceneNode.cpp
source/Irrlicht/CWaterSurfaceSceneNode.cpp
source/Irrlicht/CWADReader.cpp
source/Irrlicht/CParticleAttractionAffector.cpp
source/Irrlicht/CMeshSceneNode.cpp
source/Irrlicht/CGUIScrollBar.cpp
@ -202,7 +201,6 @@ source/Irrlicht/CAnimatedMeshSceneNode.h
source/Irrlicht/CGUIStaticText.h
source/Irrlicht/wglext.h
source/Irrlicht/CTimer.h
source/Irrlicht/CWADReader.h
source/Irrlicht/CSceneNodeAnimatorCameraFPS.h
source/Irrlicht/CParticleFadeOutAffector.h
source/Irrlicht/COpenGLSLMaterialRenderer.h

2
lib/irrlicht/include/IrrCompileConfig.h
View File

@ -337,7 +337,7 @@ defined. */
#undef __IRR_COMPILE_WITH_TAR_ARCHIVE_LOADER_
#endif
//! Define __IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_ if you want to open WAD archives
//#define __IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_
#define __IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_
#ifdef NO__IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_
#undef __IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_
#endif

5
lib/irrlicht/source/Irrlicht/CFileSystem.cpp
View File

@ -10,7 +10,6 @@
#include "CZipReader.h"
#include "CMountPointReader.h"
#include "CTarReader.h"
#include "CWADReader.h"
#include "CFileList.h"
#include "CXMLReader.h"
#include "CXMLWriter.h"
@ -60,10 +59,6 @@ CFileSystem::CFileSystem()
ArchiveLoader.push_back(new CArchiveLoaderTAR(this));
#endif
#ifdef __IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_
ArchiveLoader.push_back(new CArchiveLoaderWAD(this));
#endif
#ifdef __IRR_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_
ArchiveLoader.push_back(new CArchiveLoaderMount(this));
#endif

263
lib/irrlicht/source/Irrlicht/CWADReader.cpp
View File

@ -1,263 +0,0 @@
// Copyright (C) 2002-2012 Thomas Alten
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
// Code contributed by skreamz
#include "IrrCompileConfig.h"
#ifdef __IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_
#include "CWADReader.h"
#include "os.h"
#include "coreutil.h"
namespace irr
{
namespace io
{
//! Constructor
CArchiveLoaderWAD::CArchiveLoaderWAD( io::IFileSystem* fs)
: FileSystem(fs)
{
#ifdef _DEBUG
setDebugName("CArchiveLoaderWAD");
#endif
}
//! returns true if the file maybe is able to be loaded by this class
bool CArchiveLoaderWAD::isALoadableFileFormat(const io::path& filename) const
{
return core::hasFileExtension ( filename, "wad" );
}
//! Creates an archive from the filename
/** \param file File handle to check.
\return Pointer to newly created archive, or 0 upon error. */
IFileArchive* CArchiveLoaderWAD::createArchive(const io::path& filename, bool ignoreCase, bool ignorePaths) const
{
IFileArchive *archive = 0;
io::IReadFile* file = FileSystem->createAndOpenFile(filename);
if (file)
{
archive = createArchive ( file, ignoreCase, ignorePaths );
file->drop ();
}
return archive;
}
//! creates/loads an archive from the file.
//! \return Pointer to the created archive. Returns 0 if loading failed.
IFileArchive* CArchiveLoaderWAD::createArchive(io::IReadFile* file, bool ignoreCase, bool ignorePaths) const
{
IFileArchive *archive = 0;
if ( file )
{
file->seek ( 0 );
archive = new CWADReader(file, ignoreCase, ignorePaths);
}
return archive;
}
//! Check if the file might be loaded by this class
/** Check might look into the file.
\param file File handle to check.
\return True if file seems to be loadable. */
bool CArchiveLoaderWAD::isALoadableFileFormat(io::IReadFile* file) const
{
SWADFileHeader header;
memset(&header, 0, sizeof(header));
file->read( &header.tag, 4 );
return !strncmp ( header.tag, "WAD2", 4 ) || !strncmp ( header.tag, "WAD3", 4 );
}
//! Check to see if the loader can create archives of this type.
bool CArchiveLoaderWAD::isALoadableFileFormat(E_FILE_ARCHIVE_TYPE fileType) const
{
return fileType == EFAT_WAD;
}
void createDir ( const c8 *full );
/*!
WAD Reader
*/
CWADReader::CWADReader(IReadFile* file, bool ignoreCase, bool ignorePaths)
: CFileList((file ? file->getFileName() : io::path("")), ignoreCase, ignorePaths), File(file)
{
#ifdef _DEBUG
setDebugName("CWADReader");
#endif
if (File)
{
File->grab();
Base = File->getFileName();
Base.replace ( '\\', '/' );
// scan local headers
scanLocalHeader();
sort();
}
#if 0
for ( u32 i = 0; i < FileList.size(); ++i )
{
SWADFileEntry &e = FileList[i];
char buf[128];
snprintf ( buf, 128, "c:\\h2\\%s", e.wadFileName.c_str() );
createDir ( buf );
FILE * f = fopen ( buf, "wb" );
if ( 0 == f )
continue;
u8 * mem = new u8 [ e.header.disksize ];
File->seek ( e.header.filepos );
File->read ( mem, e.header.disksize );
fwrite ( mem, e.header.disksize, 1, f );
delete [] mem;
fclose ( f );
}
#endif
}
CWADReader::~CWADReader()
{
if (File)
File->drop();
}
//! return the id of the file Archive
const io::path& CWADReader::getArchiveName () const
{
return Base;
}
const IFileList* CWADReader::getFileList() const
{
return this;
}
//! scans for a local header, returns false if there is no more local file header.
bool CWADReader::scanLocalHeader()
{
SWADFileEntryOriginal entry;
SWADFileEntry save;
memset(&Header, 0, sizeof(SWADFileHeader));
File->read(&Header, sizeof(SWADFileHeader));
if ( 0 == strncmp ( Header.tag, "WAD2", 4 ) )
WadType = WAD_FORMAT_QUAKE2;
else
if ( 0 == strncmp ( Header.tag, "WAD3", 4 ) )
WadType = WAD_FORMAT_HALFLIFE;
else
WadType = WAD_FORMAT_UNKNOWN;
if ( WadType == WAD_FORMAT_UNKNOWN )
return false;
#ifdef __BIG_ENDIAN__
Header.numlumps = os::Byteswap::byteswap(Header.numlumps);
Header.infotableofs = os::Byteswap::byteswap(Header.infotableofs);
#endif
File->seek ( Header.infotableofs );
c8 buf[16];
for ( u32 i = 0; i < Header.numlumps; ++i )
{
// read entry
File->read(&entry, sizeof ( SWADFileEntryOriginal ));
entry.name[ sizeof ( entry.name ) - 1 ] = 0;
save.header = entry;
save.wadFileName = "/";
save.wadFileName += entry.name;
if ( WadType == WAD_FORMAT_HALFLIFE )
{
// don't know about the types! i'm guessing
switch ( entry.type )
{
case WAD_TYP_MIPTEX_HALFLIFE:
save.wadFileName += ".wal2";
break;
default:
snprintf ( buf, 16, ".%02d", entry.type );
save.wadFileName += buf;
break;
}
}
else
if ( WadType == WAD_FORMAT_QUAKE2 )
{
switch ( entry.type )
{
case WAD_TYP_MIPTEX: save.wadFileName += ".miptex"; break;
case WAD_TYP_SOUND: save.wadFileName += ".sound"; break;
case WAD_TYP_PALETTE: save.wadFileName += ".palette"; break;
case WAD_TYP_QTEX: save.wadFileName += ".qtex"; break;
case WAD_TYP_QPIC: save.wadFileName += ".qpic"; break;
case WAD_TYP_FONT: save.wadFileName += ".font"; break;
default:
snprintf ( buf, 16, ".%02d", entry.type );
save.wadFileName += buf;
break;
}
}
// add file to list
addItem(save.wadFileName,save.header.filepos, save.header.disksize, false );
//FileInfo.push_back(save);
}
return true;
}
//! opens a file by file name
IReadFile* CWADReader::createAndOpenFile(const io::path& filename)
{
s32 index = findFile(filename, false);
if (index != -1)
return createAndOpenFile(index);
return 0;
}
//! opens a file by index
IReadFile* CWADReader::createAndOpenFile(u32 index)
{
if (index >= Files.size() )
return 0;
const SFileListEntry &entry = Files[index];
return createLimitReadFile( entry.FullName, File, entry.Offset, entry.Size );
}
} // end namespace io
} // end namespace irr
#endif // __IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_

177
lib/irrlicht/source/Irrlicht/CWADReader.h
View File

@ -1,177 +0,0 @@
// Copyright (C) 2002-2012 Thomas Alten
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_WAD_READER_H_INCLUDED__
#define __C_WAD_READER_H_INCLUDED__
#include "IrrCompileConfig.h"
#ifdef __IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_
#include "IReferenceCounted.h"
#include "IReadFile.h"
#include "irrArray.h"
#include "irrString.h"
#include "IFileSystem.h"
#include "CFileList.h"
namespace irr
{
namespace io
{
enum eWADFileTypes
{
WAD_FORMAT_UNKNOWN = 0,
WAD_FORMAT_QUAKE2 = 1,
WAD_FORMAT_HALFLIFE = 2,
WAD_CMP_NONE = 0,
WAD_CMP_LZSS = 1,
WAD_TYP_NONE = 0,
WAD_TYP_LABEL = 1,
WAD_TYP_LUMPY = 64, // 64 + grab command number
WAD_TYP_PALETTE = 64,
WAD_TYP_QTEX = 65,
WAD_TYP_QPIC = 66,
WAD_TYP_SOUND = 67,
WAD_TYP_MIPTEX = 68,
WAD_TYP_MIPTEX_HALFLIFE = 67,
WAD_TYP_FONT = 70,
};
// byte-align structures
#include "irrpack.h"
struct SWADFileHeader
{
c8 tag[4]; // type of WAD format WAD2 = quake2, WAD3 = halflife
u32 numlumps;
u32 infotableofs;
} PACK_STRUCT;
struct SWADFileEntryOriginal
{
u32 filepos;
u32 disksize;
u32 size; // uncompressed
u8 type;
u8 compression;
u8 pad[2];
u8 name[16]; // must be null terminated
} PACK_STRUCT;
// Default alignment
#include "irrunpack.h"
struct SWADFileEntry
{
io::path simpleFileName;
bool operator < (const SWADFileEntry& other) const
{
return simpleFileName < other.simpleFileName;
}
io::path wadFileName;
SWADFileEntryOriginal header;
};
//! Archiveloader capable of loading WAD Archives
class CArchiveLoaderWAD : public IArchiveLoader
{
public:
//! Constructor
CArchiveLoaderWAD(io::IFileSystem* fs);
//! returns true if the file maybe is able to be loaded by this class
//! based on the file extension (e.g. ".zip")
virtual bool isALoadableFileFormat(const io::path& filename) const;
//! Check if the file might be loaded by this class
/** Check might look into the file.
\param file File handle to check.
\return True if file seems to be loadable. */
virtual bool isALoadableFileFormat(io::IReadFile* file) const;
//! Check to see if the loader can create archives of this type.
/** Check based on the archive type.
\param fileType The archive type to check.
\return True if the archile loader supports this type, false if not */
virtual bool isALoadableFileFormat(E_FILE_ARCHIVE_TYPE fileType) const;
//! Creates an archive from the filename
/** \param file File handle to check.
\return Pointer to newly created archive, or 0 upon error. */
virtual IFileArchive* createArchive(const io::path& filename, bool ignoreCase, bool ignorePaths) const;
//! creates/loads an archive from the file.
//! \return Pointer to the created archive. Returns 0 if loading failed.
virtual io::IFileArchive* createArchive(io::IReadFile* file, bool ignoreCase, bool ignorePaths) const;
private:
io::IFileSystem* FileSystem;
};
//! reads from WAD
class CWADReader : public IFileArchive, virtual CFileList
{
public:
CWADReader(IReadFile* file, bool ignoreCase, bool ignorePaths);
virtual ~CWADReader();
// file archive methods
//! return the id of the file Archive
virtual const io::path& getArchiveName() const;
//! opens a file by file name
virtual IReadFile* createAndOpenFile(const io::path& filename);
//! opens a file by index
virtual IReadFile* createAndOpenFile(u32 index);
//! returns the list of files
virtual const IFileList* getFileList() const;
//! get the class Type
virtual E_FILE_ARCHIVE_TYPE getType() const { return EFAT_WAD; }
private:
io::path Type;
//! scans for a local header, returns false if there is no more local file header.
bool scanLocalHeader();
//! splits filename from zip file into useful filenames and paths
void extractFilename(SWADFileEntry* entry);
io::path Base;
io::path MountPoint;
IReadFile* File;
eWADFileTypes WadType;
SWADFileHeader Header;
//core::array<SWADFileEntry> FileInfo;
io::IFileSystem* FileSystem;
};
} // end namespace io
} // end namespace irr
#endif
#endif // #ifdef __IRR_COMPILE_WITH_WAD_ARCHIVE_LOADER_