X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FPerson.h;h=4e0edaecb6dcf46be4f093007d2d5a7235053071;hb=4f4771bb67958d2e9180ba24d422141b9069e363;hp=3afbdca6d68e9699fbf976d759c634783a135edd;hpb=794f89c25569a9bf50f167689ca0faa3dcffc577;p=lugaru.git diff --git a/Source/Person.h b/Source/Person.h index 3afbdca..4e0edae 100644 --- a/Source/Person.h +++ b/Source/Person.h @@ -302,6 +302,7 @@ public: float stunned; float surprised; float runninghowlong; + int occluded; int lastoccluded; int laststanding; int escapednum; @@ -316,13 +317,13 @@ public: Animation tempanimation; - float occluded; - bool jumpclimb; Person(); Person(FILE*, int, unsigned); + void skeletonLoad(bool clothes = false); + // convenience functions inline Joint& joint(int bodypart) { return skeleton.joints[skeleton.jointlabels[bodypart]]; } inline XYZ& jointPos(int bodypart) { return joint(bodypart).position; } @@ -383,7 +384,7 @@ public: int SphereCheck(XYZ *p1, float radius, XYZ *p, XYZ *move, float *rotate, Model *model); int DrawSkeleton(); void Puff(int whichlabel); - void FootLand(int which, float opacity); + void FootLand(bodyparts whichfoot, float opacity); void DoStuff(); void setAnimation(int); void DoAnimations();