X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FTexture.cpp;h=2d3f2a8360d5e36fe39ee732950cdfac7f86fdc1;hb=34ce0cdd42f673a04aa29ae148d2206420dfd813;hp=a9c69cfe048646720fccdbe61ffdc5c3934647ad;hpb=6aeefd781d62a9b5b8cf2f4d3a7ba4abaf82f54f;p=lugaru.git diff --git a/Source/Texture.cpp b/Source/Texture.cpp index a9c69cf..2d3f2a8 100644 --- a/Source/Texture.cpp +++ b/Source/Texture.cpp @@ -23,7 +23,7 @@ along with Lugaru. If not, see . 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();