Fixed a bug loading all persons with the same ID. I hope it will fix weapon problems

[lugaru.git] / Source / Person.h

diff --git a/Source/Person.h b/Source/Person.h
index 21768a4f2494ea64fea340c33cea7ed62349fc1e..ebdde320af4f487e1784ac8ecb80084db61278ff 100644 (file)
--- a/Source/Person.h
+++ b/Source/Person.h
@@ -328,6 +328,8 @@ public:
     inline Joint& joint(int bodypart) { return skeleton.joints[skeleton.jointlabels[bodypart]]; }
     inline XYZ& jointPos(int bodypart) { return joint(bodypart).position; }
     inline XYZ& jointVel(int bodypart) { return joint(bodypart).velocity; }
+    inline AnimationFrame& currentFrame() { return Animation::animations[animCurrent].frames[frameCurrent]; }
+    inline AnimationFrame& targetFrame() { return Animation::animations[animTarget].frames[frameTarget]; }
 
 
     void CheckKick();
@@ -384,7 +386,7 @@ public:
     int SphereCheck(XYZ *p1, float radius, XYZ *p, XYZ *move, float *rotate, Model *model);
     int DrawSkeleton();
     void Puff(int whichlabel);
-    void FootLand(bodyparts whichfoot, float opacity);
+    void FootLand(bodypart whichfoot, float opacity);
     void DoStuff();
     void setAnimation(int);
     void DoAnimations();