X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FObjects%2FPerson.hpp;h=89d5b40277022d92e445c55449f42e86a08cbf0a;hb=d320bd1b418c85ec4b1edf967b50426f0f553322;hp=322bdeedb142c3552c4e64f1f6f0d8ac4bb32725;hpb=032eb3ccf8e2ccc6a150ac2765eb56daef77942e;p=lugaru.git
diff --git a/Source/Objects/Person.hpp b/Source/Objects/Person.hpp
index 322bdee..89d5b40 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
@@ -96,11 +98,6 @@ public:
XYZ coords;
XYZ velocity;
- //~ XYZ proportionhead;
- //~ XYZ proportionlegs;
- //~ XYZ proportionarms;
- //~ XYZ proportionbody;
-
float unconscioustime;
bool immobile;
@@ -188,7 +185,6 @@ public:
float jumpkeydowntime;
bool freefall;
-
float turnspeed;
int aitype;
@@ -322,7 +318,7 @@ public:
Person();
Person(FILE*, int, unsigned);
- void skeletonLoad(bool clothes = false);
+ void skeletonLoad();
// convenience functions
inline Joint& joint(int bodypart) { return skeleton.joints[skeleton.jointlabels[bodypart]]; }
@@ -335,6 +331,8 @@ public:
float getProportion(int part) const;
XYZ getProportionXYZ(int part) const;
+ void changeCreatureType(person_type type);
+
void CheckKick();
void CatchFire();
void DoBlood(float howmuch, int which);
@@ -380,13 +378,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);
@@ -395,12 +394,17 @@ public:
void DoAnimations();
void RagDoll(bool checkcollision);
- void takeWeapon (int weaponId);
+ void takeWeapon(int weaponId);
bool addClothes(const int& clothesId);
void addClothes();
void doAI();
+
+ bool catchKnife();
+
+ bool hasWeapon() { return (weaponactive != -1); }
+ bool isPlayerControlled() { return (aitype == playercontrolled); }
};
const int maxplayers = 10;