Moved Skeleton and Animation to their own folder.

[lugaru.git] / Source / Person.h

diff --git a/Source/Person.h b/Source/Person.h
index 3afbdca6d68e9699fbf976d759c634783a135edd..21768a4f2494ea64fea340c33cea7ed62349fc1e 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
@@ -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();