X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FPerson.h;h=cb62622f0710f4984aa2e846e5797cde223dd139;hb=bdabd9d4a53be2fa9d90f900f7e5949d2f0ef75c;hp=801553a394e363e83515e7ab37da14df5e0a3f38;hpb=90a372e7d97dd17e83a02732444788cc4b8f31a0;p=lugaru.git

diff --git a/Source/Person.h b/Source/Person.h
index 801553a..cb62622 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:
@@ -88,7 +94,6 @@ public:
     XYZ realoldcoords;
     XYZ oldcoords;
     XYZ coords;
-    XYZ originalcoords;
     XYZ velocity;
 
     XYZ proportionhead;
@@ -133,14 +138,11 @@ public:
 
     float jumppower;
     bool onground;
-    int madskills;
 
     int wentforweapon;
 
     bool calcrot;
 
-    bool backwardsanim;
-
     XYZ facing;
 
     float bleeding;
@@ -193,7 +195,6 @@ public:
     float aiupdatedelay;
     float losupdatedelay;
     int ally;
-    XYZ movetarget;
     float collide;
     float collided;
     float avoidcollided;
@@ -228,7 +229,6 @@ public:
     float weaponmissdelay;
     float highreversaldelay;
     float lowreversaldelay;
-    float nocollidedelay;
 
     int creature;
 
@@ -263,10 +263,8 @@ public:
     bool onfire;
     float onfiredelay;
     float burnt;
-    float fireduration;
 
     float flamedelay;
-    float updatestuffdelay;
 
     int playerdetail;
 
@@ -283,8 +281,6 @@ public:
     XYZ waypoints[90];
     int waypointtype[90];
     float pausetime;
-    bool hastempwaypoint;
-    XYZ tempwaypoint;
 
     XYZ headtarget;
     float interestdelay;
@@ -297,10 +293,8 @@ public:
     int lastpathfindpoint2;
     int lastpathfindpoint3;
     int lastpathfindpoint4;
-    bool onpath;
 
     int waypoint;
-    bool jumppath;
 
     XYZ lastseen;
     float lastseentime;
@@ -308,6 +302,7 @@ public:
     float stunned;
     float surprised;
     float runninghowlong;
+    int occluded;
     int lastoccluded;
     int laststanding;
     int escapednum;
@@ -320,21 +315,21 @@ public:
     int whichskin;
     bool rabbitkickragdoll;
 
-    XYZ averageloc;
-    XYZ oldaverageloc;
-
     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; }
     inline XYZ& jointVel(int bodypart) { return joint(bodypart).velocity; }
+    inline AnimationFrame& currentFrame() { return Animation::animations.at(animCurrent).frames.at(frameCurrent); }
+    inline AnimationFrame& targetFrame() { return Animation::animations.at(animTarget).frames.at(frameTarget); }
 
 
     void CheckKick();
@@ -391,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(int which, float opacity);
+    void FootLand(bodypart whichfoot, float opacity);
     void DoStuff();
     void setAnimation(int);
     void DoAnimations();
@@ -400,7 +395,7 @@ public:
     void takeWeapon (int weaponId);
 
     bool addClothes(const int& clothesId);
-    bool addClothes(const char* fileName);
+    void addClothes();
 };
 
 const int maxplayers = 10;