convenience functions

[lugaru.git] / Source / Person.h

diff --git a/Source/Person.h b/Source/Person.h
index 146a96dd6343f0ef5dfc93129316dc86953f6242..dcf3b21f377a263cb341fb08c8baacb3b68c0238 100644 (file)
--- a/Source/Person.h
+++ b/Source/Person.h
@@ -53,16 +53,16 @@ class Person
                int whichpatchx;
                int whichpatchz;
                
-        // animCurrent and animTarget are used to interpolate between different animations
-        // (and for a bunch of other things).
-        // animations interpolate with one another at various speeds.
-        // animTarget seems to determine the combat state?
+               // animCurrent and animTarget are used to interpolate between different animations
+               // (and for a bunch of other things).
+               // animations interpolate with one another at various speeds.
+               // animTarget seems to determine the combat state?
                int animCurrent;
                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).
-        // animations advance at various speeds.
+               // 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 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;
@@ -128,7 +125,7 @@ class Person
                float damage;
                float permanentdamage;
                float superpermanentdamage;
-        float lastcollide;
+               float lastcollide;
                int dead;
                
                float jumppower;
@@ -201,7 +198,7 @@ class Person
                bool whichdirection;
                float whichdirectiondelay;
                bool avoidsomething;
-        XYZ avoidwhere;                
+               XYZ avoidwhere;         
                float blooddimamount;
                
                float staggerdelay;
@@ -262,7 +259,7 @@ class Person
                bool spurt;
                bool onfire;
                float onfiredelay;
-        float burnt;
+               float burnt;
                float fireduration;
                
                float flamedelay;
@@ -306,7 +303,7 @@ class Person
                float stunned;
                float surprised;
                float runninghowlong;
-        int lastoccluded;
+               int lastoccluded;
                int laststanding;
                int escapednum;
                
@@ -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);
@@ -377,7 +379,7 @@ class Person
                void DoMipmaps()
                {
                  skeleton.drawmodel.textureptr.bind();
-          glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
+                 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]);
                }
 
@@ -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);