X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FObjects%2FWeapons.hpp;h=de2f4d81829f81ff039a224fb755cc089369f988;hb=a3f060d7e5508cd032c4f1c320033a74e5d84009;hp=2f802f742a14a089d8dd4558880faf519d2720ff;hpb=03fbcc5b5e18dbf62c48849fc8d02cd250aa744e;p=lugaru.git

diff --git a/Source/Objects/Weapons.hpp b/Source/Objects/Weapons.hpp
index 2f802f7..de2f4d8 100644
--- a/Source/Objects/Weapons.hpp
+++ b/Source/Objects/Weapons.hpp
@@ -32,9 +32,6 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 
 #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;