X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FObjects%2FWeapons.hpp;h=de2f4d81829f81ff039a224fb755cc089369f988;hb=afdb97f1c3e430801a1fd0c1b04a8a2102e8f1ac;hp=33d93aa9cbf724f62cfcc222665f186d91d9d44f;hpb=188b251d145503cab17680a22cbabf58b24358d5;p=lugaru.git
diff --git a/Source/Objects/Weapons.hpp b/Source/Objects/Weapons.hpp
index 33d93aa..de2f4d8 100644
--- a/Source/Objects/Weapons.hpp
+++ b/Source/Objects/Weapons.hpp
@@ -32,9 +32,6 @@ along with Lugaru. If not, see .
#include
-#define max_weapons 30
-#define max_weaponinstances 20
-
#define knife 1
#define sword 2
#define staff 3
@@ -44,23 +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;
@@ -94,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;