Changed Weapon models and textures to be private

[lugaru.git] / Source / Objects / Weapons.hpp

diff --git a/Source/Objects/Weapons.hpp b/Source/Objects/Weapons.hpp
index 9258e9ef93499e1528031bbafffbd4766e567f49..4b40eb6e6baf29fb964d00f2a0ab5348a531a72c 100644 (file)
--- a/Source/Objects/Weapons.hpp
+++ b/Source/Objects/Weapons.hpp
@@ -27,7 +27,7 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include "Graphic/Models.hpp"
 #include "Graphic/Sprite.hpp"
 #include "Graphic/Texture.hpp"
-#include "Math/Quaternions.hpp"
+#include "Math/XYZ.hpp"
 #include "Objects/Person.hpp"
 
 #include <cmath>
@@ -44,18 +44,7 @@ class Weapon
 public:
     Weapon(int type, int owner);
 
-    static Model throwingknifemodel;
-    static Texture knifetextureptr;
-    static Texture lightbloodknifetextureptr;
-    static Texture bloodknifetextureptr;
-
-    static Model swordmodel;
-    static Texture swordtextureptr;
-    static Texture lightbloodswordtextureptr;
-    static Texture bloodswordtextureptr;
-
-    static Model staffmodel;
-    static Texture stafftextureptr;
+    static void Load();
 
     void Draw();
     void DoStuff(int);
@@ -92,7 +81,21 @@ public:
     float bigtilt2;
     float smallrotation;
     float smallrotation2;
+
 private:
+    static Model throwingknifemodel;
+    static Texture knifetextureptr;
+    static Texture lightbloodknifetextureptr;
+    static Texture bloodknifetextureptr;
+
+    static Model swordmodel;
+    static Texture swordtextureptr;
+    static Texture lightbloodswordtextureptr;
+    static Texture bloodswordtextureptr;
+
+    static Model staffmodel;
+    static Texture stafftextureptr;
+
     int type;
 
     XYZ oldtippoint;
@@ -122,7 +125,6 @@ class Weapons : public std::vector<Weapon>
 {
 public:
     Weapons();
-    ~Weapons();
 
     int Draw();
     void DoStuff();