Moved LoadTGA into namespace OpenArena

~g2k
This commit is contained in:
2006-06-18 14:41:27 -04:00
parent 695531ce19
commit e18fd98a46
2 changed files with 28 additions and 22 deletions

View File

@@ -10,6 +10,7 @@
#include <string> #include <string>
#include "texture.h" #include "texture.h"
namespace OpenArena{
struct TGAHeader struct TGAHeader
{ {
GLubyte Header[12]; // File Header To Determine File Type 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 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* LoadUncompressedTGA(FILE *); // Load an Uncompressed file
TextureImage* LoadCompressedTGA(FILE *); // Load a Compressed file TextureImage* LoadCompressedTGA(FILE *); // Load a Compressed file
};
#endif #endif

View File

@@ -1,6 +1,10 @@
#include "../include/tga.h" #include "../include/tga.h"
#ifdef WIN32
#pragma warning(disable:4996)
#endif
namespace OpenArena{
TextureImage* LoadTGA(const char * filename) TextureImage* LoadTGA(const char * filename)
{ {
TGAHeader tgaheader; TGAHeader tgaheader;
@@ -662,3 +666,4 @@ TextureImage* LoadCompressedTGA(FILE * fTGA)
return image; return image;
} }
*/ */
};