Oops, committed by mistake a temporary commenting of code

[lugaru.git] / Source / Person.h

diff --git a/Source/Person.h b/Source/Person.h
index 4e0edaecb6dcf46be4f093007d2d5a7235053071..ebdde320af4f487e1784ac8ecb80084db61278ff 100644 (file)
--- a/Source/Person.h
+++ b/Source/Person.h
@@ -25,14 +25,14 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "gamegl.h"
 #include "Quaternions.h"
-#include "Skeleton.h"
+#include "Animation/Skeleton.h"
 #include "Models.h"
 #include "Terrain.h"
 #include "Sprite.h"
 #include <cmath>
 #include <memory>
 #include "Weapons.h"
-#include "Animation.h"
+#include "Animation/Animation.h"
 
 #define passivetype 0
 #define guardtype 1
@@ -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();