Moved LoadTGA into namespace OpenArena
~g2k
This commit is contained in:
@@ -10,6 +10,7 @@
|
||||
#include <string>
|
||||
#include "texture.h"
|
||||
|
||||
namespace OpenArena{
|
||||
struct TGAHeader
|
||||
{
|
||||
GLubyte Header[12]; // File Header To Determine File Type
|
||||
@@ -32,5 +33,5 @@ const GLubyte uTGAcompare[12] = {0,0,2, 0,0,0,0,0,0,0,0,0}; // Uncompressed TGA
|
||||
const GLubyte cTGAcompare[12] = {0,0,10,0,0,0,0,0,0,0,0,0}; // Compressed TGA Header
|
||||
TextureImage* LoadUncompressedTGA(FILE *); // Load an Uncompressed file
|
||||
TextureImage* LoadCompressedTGA(FILE *); // Load a Compressed file
|
||||
|
||||
};
|
||||
#endif
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
|
||||
#include "../include/tga.h"
|
||||
#ifdef WIN32
|
||||
#pragma warning(disable:4996)
|
||||
#endif
|
||||
|
||||
namespace OpenArena{
|
||||
TextureImage* LoadTGA(const char * filename)
|
||||
{
|
||||
TGAHeader tgaheader;
|
||||
@@ -662,3 +666,4 @@ TextureImage* LoadCompressedTGA(FILE * fTGA)
|
||||
return image;
|
||||
}
|
||||
*/
|
||||
};
|
||||
Reference in New Issue
Block a user