X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FObjects%2FPerson.hpp;h=57f3ebb1f49bc5a7bf7221e061f1488ddc472e4e;hb=5ab55c3eea543a30fe979f623d4a984935e2a0fb;hp=8ad65301ee1e80640202c64ed33670b6e4fc4cb6;hpb=de9ba9db05eccf77c3efebe4cd3bf7636b899064;p=lugaru.git

diff --git a/Source/Objects/Person.hpp b/Source/Objects/Person.hpp
index 8ad6530..57f3ebb 100644
--- a/Source/Objects/Person.hpp
+++ b/Source/Objects/Person.hpp
@@ -1,6 +1,6 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
-Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
+Copyright (C) 2010-2017 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
@@ -27,7 +27,7 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include "Graphic/gamegl.hpp"
 #include "Graphic/Models.hpp"
 #include "Graphic/Sprite.hpp"
-#include "Math/Quaternions.hpp"
+#include "Math/XYZ.hpp"
 #include "Objects/Weapons.hpp"
 
 #include <cmath>
@@ -43,8 +43,11 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #define getweapontype 7
 #define pathfindtype 8
 
-#define rabbittype 0
-#define wolftype 1
+enum person_type
+{
+    rabbittype = 0,
+    wolftype = 1
+};
 
 struct InvalidPersonException : public exception {
    const char * what () const throw () {
@@ -52,8 +55,20 @@ struct InvalidPersonException : public exception {
    }
 };
 
+class PersonType
+{
+public:
+    // head, body, arms, legs
+    XYZ proportions[4];
+    static std::vector<PersonType> types;
+    static void Load();
+};
+
 class Person : public enable_shared_from_this<Person>
 {
+private:
+    float proportions[4];
+
 public:
     static std::vector<std::shared_ptr<Person>> players;
 
@@ -95,10 +110,10 @@ public:
     XYZ coords;
     XYZ velocity;
 
-    XYZ proportionhead;
-    XYZ proportionlegs;
-    XYZ proportionarms;
-    XYZ proportionbody;
+    //~ XYZ proportionhead;
+    //~ XYZ proportionlegs;
+    //~ XYZ proportionarms;
+    //~ XYZ proportionbody;
 
     float unconscioustime;
 
@@ -330,6 +345,8 @@ public:
     inline AnimationFrame& currentFrame() { return Animation::animations.at(animCurrent).frames.at(frameCurrent); }
     inline AnimationFrame& targetFrame() { return Animation::animations.at(animTarget).frames.at(frameTarget); }
 
+    void setProportions(float, float, float, float);
+    XYZ getProportion(int part) const;
 
     void CheckKick();
     void CatchFire();