Moved as much as possible init in Person constructor

[lugaru.git] / Source / Person.h

diff --git a/Source/Person.h b/Source/Person.h
index 0c030ab3cae27c6962de5511b886be3fb6c2e640..a11f22bdafb074882c302ae2731af931937e773c 100644 (file)
--- a/Source/Person.h
+++ b/Source/Person.h
@@ -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,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();