maj/OpenArena
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed Moved LoadBMP into the OpenArena namespace

Browse Source 
~g2k
This commit is contained in:
Tom Hicks
2006-06-18 14:30:52 -04:00
parent 64c8c11d0c
commit b03bdb0cbc
2 changed files with 163 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/bmp.h
View File

@@ -5,6 +5,8 @@
#include "datatypes.h" #include "datatypes.h"
#include "texture.h" #include "texture.h"
namespace OpenArena{
TextureImage* LoadBMP(const char* Filename); TextureImage* LoadBMP(const char* Filename);
};
#endif #endif

6
src/bmp.cpp
View File

@@ -20,6 +20,11 @@
#include <cstdio> #include <cstdio>
#include "../include/bmp.h" #include "../include/bmp.h"
#ifdef WIN32
#pragma warning(disable:4996)
#endif
namespace OpenArena{
#pragma pack(push,1) #pragma pack(push,1)
struct BITMAP_HEADER struct BITMAP_HEADER
@@ -192,3 +197,4 @@ TextureImage* LoadBMP(const char* fn)
} }
return NULL; return NULL;
} }
};