Commit 5f509b21 authored by hybrid's avatar hybrid

Oops, actually three file formats with two enabling defines. Fixed now for both (LMP and WAL).

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4305 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 3bd9de30
This diff is collapsed.
......@@ -12,9 +12,6 @@
#define __C_IMAGE_LOADER_WAL_H_INCLUDED__
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_WAL_LOADER_
#include "IImageLoader.h"
namespace irr
......@@ -22,6 +19,20 @@ namespace irr
namespace video
{
#ifdef _IRR_COMPILE_WITH_LMP_LOADER_
// byte-align structures
#include "irrpack.h"
struct SLMPHeader {
u32 width; // width
u32 height; // height
// variably sized
} PACK_STRUCT;
// Default alignment
#include "irrunpack.h"
//! An Irrlicht image loader for Quake1,2 engine lmp textures/palette
class CImageLoaderLMP : public irr::video::IImageLoader
{
......@@ -31,6 +42,10 @@ public:
virtual irr::video::IImage* loadImage(irr::io::IReadFile* file) const;
};
#endif
#ifdef _IRR_COMPILE_WITH_WAL_LOADER_
//! An Irrlicht image loader for quake2 wal engine textures
class CImageLoaderWAL : public irr::video::IImageLoader
{
......@@ -52,12 +67,6 @@ public:
// byte-align structures
#include "irrpack.h"
struct SLMPHeader {
u32 width; // width
u32 height; // height
// variably sized
} PACK_STRUCT;
// Halfelife wad3 type 67 file
struct miptex_halflife
{
......@@ -82,9 +91,10 @@ public:
// Default alignment
#include "irrunpack.h"
#endif
}
}
#endif
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment