X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FObjects%2FWeapons.hpp;h=90b956753a4376d6b0806e0cc90943d4d016d141;hb=0aab437dc560d2afa982e61cc2547756ad7b0761;hp=9258e9ef93499e1528031bbafffbd4766e567f49;hpb=ed3662c0852c4312a612b4fc35bd03aba8d13db7;p=lugaru.git

diff --git a/Source/Objects/Weapons.hpp b/Source/Objects/Weapons.hpp
index 9258e9e..90b9567 100644
--- a/Source/Objects/Weapons.hpp
+++ b/Source/Objects/Weapons.hpp
@@ -1,6 +1,6 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
-Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
+Copyright (C) 2010-2017 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
@@ -27,14 +27,11 @@ 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>
 
-#define max_weapons 30
-#define max_weaponinstances 20
-
 #define knife 1
 #define sword 2
 #define staff 3
@@ -44,21 +41,10 @@ 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);
+    void draw();
+    void doStuff(int);
 
     int getType() {
         return type;
@@ -92,7 +78,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 +122,6 @@ class Weapons : public std::vector<Weapon>
 {
 public:
     Weapons();
-    ~Weapons();
 
     int Draw();
     void DoStuff();