X-Git-Url: https://git.jsancho.org/?p=lugaru.git;a=blobdiff_plain;f=Source%2FObjects%2FWeapons.hpp;h=4b40eb6e6baf29fb964d00f2a0ab5348a531a72c;hp=33d93aa9cbf724f62cfcc222665f186d91d9d44f;hb=fa715e9d69feb1dd832365c31be2a95835d798fc;hpb=188b251d145503cab17680a22cbabf58b24358d5 diff --git a/Source/Objects/Weapons.hpp b/Source/Objects/Weapons.hpp index 33d93aa..4b40eb6 100644 --- a/Source/Objects/Weapons.hpp +++ b/Source/Objects/Weapons.hpp @@ -44,19 +44,6 @@ 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(); @@ -94,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;