X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=Source%2FPerson.h;h=a11f22bdafb074882c302ae2731af931937e773c;hb=20e924d;hp=0c030ab3cae27c6962de5511b886be3fb6c2e640;hpb=8adc09e313ab2cec1ba28ac9a929b90880d9b2b1;p=lugaru.git
diff --git a/Source/Person.h b/Source/Person.h
index 0c030ab..a11f22b 100644
--- a/Source/Person.h
+++ b/Source/Person.h
@@ -47,6 +47,12 @@ along with Lugaru. If not, see .
#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
{
public:
@@ -296,6 +302,7 @@ public:
float stunned;
float surprised;
float runninghowlong;
+ int occluded;
int lastoccluded;
int laststanding;
int escapednum;
@@ -310,11 +317,10 @@ public:
Animation tempanimation;
- float occluded;
-
bool jumpclimb;
Person();
+ Person(FILE*, int, unsigned);
// convenience functions
inline Joint& joint(int bodypart) { return skeleton.joints[skeleton.jointlabels[bodypart]]; }
@@ -376,7 +382,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();