X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=Source%2FPerson.h;h=21768a4f2494ea64fea340c33cea7ed62349fc1e;hb=4d0ec1838440e55f24e8ec9501a62348cd9e2ec3;hp=9739d39db5a03f48512229713cf7726593926b32;hpb=06e3212c9d53fdd7e94a49316d65eff1b0c1b1b6;p=lugaru.git
diff --git a/Source/Person.h b/Source/Person.h
index 9739d39..21768a4 100644
--- a/Source/Person.h
+++ b/Source/Person.h
@@ -25,14 +25,14 @@ along with Lugaru. If not, see .
#include "gamegl.h"
#include "Quaternions.h"
-#include "Skeleton.h"
+#include "Animation/Skeleton.h"
#include "Models.h"
#include "Terrain.h"
#include "Sprite.h"
#include
#include
#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; }