X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FTexture.cpp;h=150eee73b76a0fb00d9a1950d5f838def3a32292;hb=97989f58ab13c64fbe05e629d2b2a024a2c3cfa4;hp=a9c69cfe048646720fccdbe61ffdc5c3934647ad;hpb=cd043e3f9e26c2b3406b40a354c2840941e9db7f;p=lugaru.git

diff --git a/Source/Texture.cpp b/Source/Texture.cpp
index a9c69cf..150eee7 100644
--- a/Source/Texture.cpp
+++ b/Source/Texture.cpp
@@ -19,11 +19,11 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "gamegl.h"
 #include "Texture.h"
-#include "TGALoader.h"
+#include "ImageIO.h"
 
 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();