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

Changed Moved LoadTGA into the BitmapImage class

Browse Source 
Changed Moved LoadBMP into the BitmapImage class
~G2k
This commit is contained in:
Tom Hicks
2006-07-01 23:49:22 -04:00
parent 292f481abc
commit d0ffc0df39
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mygl.cpp
View File

@@ -12,7 +12,7 @@ namespace OpenArena
if(Right(tolower(fn), 4) == ".bmp") if(Right(tolower(fn), 4) == ".bmp")
{ {
TextureImage* texImage = NULL; TextureImage* texImage = NULL;
if(texImage = LoadBMP(fn.c_str())) if(texImage = BitmapImage::LoadBMP(fn.c_str()))
{ {
glGenTextures(1, &texture); glGenTextures(1, &texture);
glBindTexture(GL_TEXTURE_2D, texture); glBindTexture(GL_TEXTURE_2D, texture);
@@ -36,7 +36,7 @@ namespace OpenArena
else if(Right(tolower(fn), 4) == ".tga") else if(Right(tolower(fn), 4) == ".tga")
{ {
TextureImage* texImage = NULL; TextureImage* texImage = NULL;
if(texImage = LoadTGA(fn.c_str())) if(texImage = TargaImage::LoadTGA(fn.c_str()))
{ {
glGenTextures(1, &texture); glGenTextures(1, &texture);
glBindTexture(GL_TEXTURE_2D, texture); glBindTexture(GL_TEXTURE_2D, texture);