remove repetitive code

[lugaru.git] / Source / Person.h

diff --git a/Source/Person.h b/Source/Person.h
index 345259a2e916484d180f0317110b5403dbf948ad..dcf3b21f377a263cb341fb08c8baacb3b68c0238 100644 (file)
--- a/Source/Person.h
+++ b/Source/Person.h
@@ -61,7 +61,7 @@ class Person
                int animTarget;
 
                // frameCurrent and frameTarget are used to interpolate between the frames of an animation
-               // (e.g. the crouched animation has only two frames, lerped back and forth).
+               // (e.g. the crouched animation has only two frames, lerped back and forth slowly).
                // animations advance at various speeds.
                int frameCurrent;
                int frameTarget;
@@ -94,9 +94,6 @@ class Person
                XYZ proportionarms;
                XYZ proportionbody;
                
-               float heightleft;
-               float heightright;
-               
                float unconscioustime;
                
                bool immobile;
@@ -329,6 +326,11 @@ class Person
 
 
 
+               // convenience
+               Joint& joint(int);
+               XYZ& jointPos(int);
+               XYZ& jointVel(int);
+
                void CheckKick();
                void CatchFire();
                void DoBlood(float howmuch, int which);
@@ -386,7 +388,6 @@ class Person
                void Puff(int whichlabel);
                void FootLand(int which, float opacity);
                void DoStuff();
-               Joint& getJointFor(int);
                void setAnimation(int);
                void DoAnimations();
                void RagDoll(bool checkcollision);