Add copyright notice and AUTHORS file for open source contributors

[lugaru.git] / Source / Texture.cpp

diff --git a/Source/Texture.cpp b/Source/Texture.cpp
index a9c69cfe048646720fccdbe61ffdc5c3934647ad..e8bcaa9d1274b28a9b18a8e01ec10014856180eb 100644 (file)
--- a/Source/Texture.cpp
+++ b/Source/Texture.cpp
@@ -1,5 +1,6 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
@@ -19,11 +20,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 +61,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 +147,6 @@ void TextureRes::reloadAll()
 }
 
 
-
-
 void Texture::load(const string& filename, bool hasMipmap, bool hasAlpha)
 {
     destroy();