X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameInitDispose.cpp;h=60727a73b66dc1e1910f65d4b32de6f097ea226a;hb=34ce0cdd42f673a04aa29ae148d2206420dfd813;hp=c7663322b195a7f016aa6670fe86b3a0f88a44d2;hpb=6aeefd781d62a9b5b8cf2f4d3a7ba4abaf82f54f;p=lugaru.git diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp index c766332..60727a7 100644 --- a/Source/GameInitDispose.cpp +++ b/Source/GameInitDispose.cpp @@ -53,7 +53,7 @@ extern float multiplier; extern int netdatanew; extern float mapinfo; extern bool stillloading; -extern TGAImageRec texture; +extern ImageRec texture; extern short vRefNum; extern long dirID; extern int mainmenu; @@ -170,14 +170,8 @@ void LoadSave(const char *fileName, GLuint *textureid, bool mipmap, GLubyte *arr float temptexdetail = texdetail; texdetail = 1; - // Converting file to something os specific - char * fixedFN = ConvertFileName(fileName); - - //Load Image - unsigned char fileNamep[256]; - CopyCStringToPascal(fixedFN, fileNamep); //Load Image - upload_image( fileNamep , 0); + upload_image(ConvertFileName(fileName)); texdetail = temptexdetail; int bytesPerPixel = texture.bpp / 8;