First step at cleaning image loading.

[lugaru.git] / Source / Texture.cpp

diff --git a/Source/Texture.cpp b/Source/Texture.cpp
index a9c69cfe048646720fccdbe61ffdc5c3934647ad..2d3f2a8360d5e36fe39ee732950cdfac7f86fdc1 100644 (file)
--- a/Source/Texture.cpp
+++ b/Source/Texture.cpp
@@ -23,7 +23,7 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 
 using namespace std;
 
-extern TGAImageRec texture;
+extern ImageRec texture;
 extern bool trilinear;
 
 
@@ -60,9 +60,7 @@ void TextureRes::load()
 {
     //load image into 'texture' global var
     if (!skindata) {
-        unsigned char filenamep[256];
-        CopyCStringToPascal(ConvertFileName(filename.c_str()), filenamep);
-        upload_image(filenamep, hasAlpha);
+        upload_image(ConvertFileName(filename.c_str()));
     }
 
     skinsize = texture.sizeX;
@@ -148,8 +146,6 @@ void TextureRes::reloadAll()
 }
 
 
-
-
 void Texture::load(const string& filename, bool hasMipmap, bool hasAlpha)
 {
     destroy();