X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGraphic%2FTexture.cpp;h=9dd4ea60be08eac20d5fbc66e04125598944c0b9;hb=1a6ef830cdd01a9b7a8bbcfde8a51b7c430671a3;hp=fe732bfd3314e9802afb354776fa57b0a948aba7;hpb=3f8ee86c6085b5d6c7ee31b916d0e022239750ab;p=lugaru.git

diff --git a/Source/Graphic/Texture.cpp b/Source/Graphic/Texture.cpp
index fe732bf..9dd4ea6 100644
--- a/Source/Graphic/Texture.cpp
+++ b/Source/Graphic/Texture.cpp
@@ -89,8 +89,9 @@ TextureRes::TextureRes(const string& _filename, bool _hasMipmap, GLubyte* array,
 {
     load();
     *skinsizep = skinsize;
-    for (int i = 0; i < datalen; i++)
+    for (int i = 0; i < datalen; i++) {
         array[i] = data[i];
+    }
 }
 
 TextureRes::~TextureRes()
@@ -101,22 +102,12 @@ TextureRes::~TextureRes()
 
 void Texture::load(const string& filename, bool hasMipmap)
 {
-    destroy();
-    tex = new TextureRes(Folders::getResourcePath(filename), hasMipmap);
+    tex.reset(new TextureRes(Folders::getResourcePath(filename), hasMipmap));
 }
 
 void Texture::load(const string& filename, bool hasMipmap, GLubyte* array, int* skinsizep)
 {
-    destroy();
-    tex = new TextureRes(Folders::getResourcePath(filename), hasMipmap, array, skinsizep);
-}
-
-void Texture::destroy()
-{
-    if (tex) {
-        delete tex;
-        tex = NULL;
-    }
+    tex.reset(new TextureRes(Folders::getResourcePath(filename), hasMipmap, array, skinsizep));
 }
 
 void Texture::bind()