Changed Moved LoadBMP into the OpenArena namespace
~g2k
This commit is contained in:
@@ -5,6 +5,8 @@
|
||||
#include "datatypes.h"
|
||||
#include "texture.h"
|
||||
|
||||
namespace OpenArena{
|
||||
TextureImage* LoadBMP(const char* Filename);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -20,6 +20,11 @@
|
||||
|
||||
#include <cstdio>
|
||||
#include "../include/bmp.h"
|
||||
#ifdef WIN32
|
||||
#pragma warning(disable:4996)
|
||||
#endif
|
||||
|
||||
namespace OpenArena{
|
||||
|
||||
#pragma pack(push,1)
|
||||
struct BITMAP_HEADER
|
||||
@@ -192,3 +197,4 @@ TextureImage* LoadBMP(const char* fn)
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
};
|
||||
Reference in New Issue
Block a user