X-Git-Url: https://git.jsancho.org/?p=lugaru.git;a=blobdiff_plain;f=Source%2FObjects%2FPerson.hpp;h=2ead16e9a87922d662cbf65b5bc922175afe6a74;hp=0734eaa5e2e3dd2022fde3f0316e1acdddd9896e;hb=6a8cb464330e92163c8feaf101b8b5837c973bba;hpb=5fca41ab430df85d6dd620a7f4130df01bc1430f diff --git a/Source/Objects/Person.hpp b/Source/Objects/Person.hpp index 0734eaa..2ead16e 100644 --- a/Source/Objects/Person.hpp +++ b/Source/Objects/Person.hpp @@ -24,9 +24,9 @@ along with Lugaru. If not, see . #include "Animation/Animation.hpp" #include "Animation/Skeleton.hpp" #include "Environment/Terrain.hpp" -#include "Graphic/gamegl.hpp" #include "Graphic/Models.hpp" #include "Graphic/Sprite.hpp" +#include "Graphic/gamegl.hpp" #include "Math/XYZ.hpp" #include "Objects/PersonType.hpp" #include "Objects/Weapons.hpp" @@ -44,10 +44,12 @@ along with Lugaru. If not, see . #define getweapontype 7 #define pathfindtype 8 -struct InvalidPersonException : public exception { - const char * what () const throw () { - return "Invalid weapon number"; - } +struct InvalidPersonException : public exception +{ + const char* what() const throw() + { + return "Invalid weapon number"; + } }; class Person : public enable_shared_from_this @@ -183,7 +185,6 @@ public: float jumpkeydowntime; bool freefall; - float turnspeed; int aitype; @@ -375,13 +376,14 @@ public: void Reverse(); void DoDamage(float howmuch); void DoHead(); - void DoMipmaps() { + void DoMipmaps() + { skeleton.drawmodel.textureptr.bind(); glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, skeleton.skinsize, skeleton.skinsize, 0, GL_RGB, GL_UNSIGNED_BYTE, &skeleton.skinText[0]); } - int SphereCheck(XYZ *p1, float radius, XYZ *p, XYZ *move, float *rotate, Model *model); + int SphereCheck(XYZ* p1, float radius, XYZ* p, XYZ* move, float* rotate, Model* model); int DrawSkeleton(); void Puff(int whichlabel); void FootLand(bodypart whichfoot, float opacity); @@ -390,7 +392,7 @@ public: void DoAnimations(); void RagDoll(bool checkcollision); - void takeWeapon (int weaponId); + void takeWeapon(int weaponId); bool addClothes(const int& clothesId); void addClothes();