X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGraphic%2FModels.cpp;h=1e5947277b70d4fb2ed0a0ca3794d0191bafbd1e;hb=ce7c8b6c4db753fef7cf634a09aa63d8a4545c9b;hp=a9833d05e05c8dc486574cf326b28a405c2f9dc6;hpb=b84825978803615f45a9f128232e62431042aec0;p=lugaru.git

diff --git a/Source/Graphic/Models.cpp b/Source/Graphic/Models.cpp
index a9833d0..1e59472 100644
--- a/Source/Graphic/Models.cpp
+++ b/Source/Graphic/Models.cpp
@@ -18,9 +18,10 @@ You should have received a copy of the GNU General Public License
 along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "Game.h"
-#include "Graphic/Models.h"
-#include "Utils/Folders.h"
+#include "Graphic/Models.hpp"
+
+#include "Game.hpp"
+#include "Utils/Folders.hpp"
 
 extern float multiplier;
 extern float viewdistance;
@@ -929,15 +930,7 @@ void Model::drawdifftex(GLuint texture)
     glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT );
     glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT );
 
-
-#ifndef WIN32
-    glLockArraysEXT( 0, TriangleNum * 3);
-#endif
     glDrawArrays(GL_TRIANGLES, 0, TriangleNum * 3);
-#ifndef WIN32
-    glUnlockArraysEXT();
-#endif
-
 
     if (!color)
         glDisableClientState(GL_NORMAL_ARRAY);
@@ -961,15 +954,7 @@ void Model::drawdifftex(Texture texture)
     glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT );
     glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT );
 
-
-#ifndef WIN32
-    glLockArraysEXT( 0, TriangleNum * 3);
-#endif
     glDrawArrays(GL_TRIANGLES, 0, TriangleNum * 3);
-#ifndef WIN32
-    glUnlockArraysEXT();
-#endif
-
 
     if (!color)
         glDisableClientState(GL_NORMAL_ARRAY);
@@ -1373,7 +1358,6 @@ void Model::MakeDecal(int atype, XYZ where, float size, float opacity, float rot
 Model::~Model()
 {
     deallocate();
-    textureptr.destroy();
 }
 
 void Model::deallocate()
@@ -1446,7 +1430,7 @@ void Model::deallocate()
     free(decalposition);
     decalposition = 0;
 
-};
+}
 
 Model::Model()
 {