X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FPerson.h;h=21768a4f2494ea64fea340c33cea7ed62349fc1e;hb=4d0ec1838440e55f24e8ec9501a62348cd9e2ec3;hp=0c030ab3cae27c6962de5511b886be3fb6c2e640;hpb=8adc09e313ab2cec1ba28ac9a929b90880d9b2b1;p=lugaru.git

diff --git a/Source/Person.h b/Source/Person.h
index 0c030ab..21768a4 100644
--- 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
@@ -47,6 +47,12 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #define rabbittype 0
 #define wolftype 1
 
+struct InvalidPersonException : public exception {
+   const char * what () const throw () {
+      return "Invalid weapon number";
+   }
+};
+
 class Person : public enable_shared_from_this<Person>
 {
 public:
@@ -296,6 +302,7 @@ public:
     float stunned;
     float surprised;
     float runninghowlong;
+    int occluded;
     int lastoccluded;
     int laststanding;
     int escapednum;
@@ -310,11 +317,12 @@ 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]]; }
@@ -376,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();