Removed all modifications of Account active from outside Account

[lugaru.git] / Source / Models.h

diff --git a/Source/Models.h b/Source/Models.h
index 6cbb5c5d7a2e3d5d4b79c778a437eafb092765a9..3874e233003710e5122983fe42234c9f60001cbf 100644 (file)
--- a/Source/Models.h
+++ b/Source/Models.h
@@ -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.
 
@@ -121,16 +122,15 @@ public:
     int SphereCheck(XYZ *p1, float radius, XYZ *p, XYZ *move, float *rotate);
     int SphereCheckPossible(XYZ *p1, float radius, XYZ *move, float *rotate);
     int LineCheck(XYZ *p1, XYZ *p2, XYZ *p, XYZ *move, float *rotate);
-    int LineCheckSlide(XYZ *p1, XYZ *p2, XYZ *p, XYZ *move, float *rotate);
     int LineCheckPossible(XYZ *p1, XYZ *p2, XYZ *p, XYZ *move, float *rotate);
     int LineCheckSlidePossible(XYZ *p1, XYZ *p2, XYZ *p, XYZ *move, float *rotate);
     void UpdateVertexArray();
     void UpdateVertexArrayNoTex();
     void UpdateVertexArrayNoTexNoNorm();
-    bool loadnotex(const char *filename);
-    bool loadraw(char *filename);
-    bool load(const char *filename, bool texture);
-    bool loaddecal(const char *filename, bool texture);
+    bool loadnotex(const std::string& filename);
+    bool loadraw(const std::string& filename);
+    bool load(const std::string& filename, bool texture);
+    bool loaddecal(const std::string& filename, bool texture);
     void Scale(float xscale, float yscale, float zscale);
     void FlipTexCoords();
     void UniformTexCoords();
@@ -142,7 +142,6 @@ public:
     void drawdifftex(GLuint texture);
     void drawdifftex(Texture texture);
     void drawimmediate();
-    void drawdiffteximmediate(GLuint texture);
     void Rotate(float xang, float yang, float zang);
     ~Model();
     void deallocate();