From fa715e9d69feb1dd832365c31be2a95835d798fc Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=B4me=20Chilliet?= Date: Wed, 4 Jan 2017 15:02:01 +0100 Subject: [PATCH] Changed Weapon models and textures to be private --- Source/Objects/Weapons.hpp | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) 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; -- 2.39.5