From d0ffc0df39ad7a08ad25bfd6a067b9ff450f0292 Mon Sep 17 00:00:00 2001 From: Tom Hicks Date: Sat, 1 Jul 2006 23:49:22 -0400 Subject: [PATCH] Changed Moved LoadTGA into the BitmapImage class Changed Moved LoadBMP into the BitmapImage class ~G2k --- src/mygl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mygl.cpp b/src/mygl.cpp index cc6d28d..ebf3803 100644 --- a/src/mygl.cpp +++ b/src/mygl.cpp @@ -12,7 +12,7 @@ namespace OpenArena if(Right(tolower(fn), 4) == ".bmp") { TextureImage* texImage = NULL; - if(texImage = LoadBMP(fn.c_str())) + if(texImage = BitmapImage::LoadBMP(fn.c_str())) { glGenTextures(1, &texture); glBindTexture(GL_TEXTURE_2D, texture); @@ -36,7 +36,7 @@ namespace OpenArena else if(Right(tolower(fn), 4) == ".tga") { TextureImage* texImage = NULL; - if(texImage = LoadTGA(fn.c_str())) + if(texImage = TargaImage::LoadTGA(fn.c_str())) { glGenTextures(1, &texture); glBindTexture(GL_TEXTURE_2D, texture);