X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FObjects%2FPerson.hpp;h=856f050fee4d4f07713670cefea2e24be25009cb;hb=9981ce00aba99f97ecca8ff7e9331c3a11d8c1be;hp=bd384241f22ade2c5305afbce46037960a54676c;hpb=0aab437dc560d2afa982e61cc2547756ad7b0761;p=lugaru.git

diff --git a/Source/Objects/Person.hpp b/Source/Objects/Person.hpp
index bd38424..856f050 100644
--- a/Source/Objects/Person.hpp
+++ b/Source/Objects/Person.hpp
@@ -23,6 +23,7 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "Animation/Animation.hpp"
 #include "Animation/Skeleton.hpp"
+#include "Audio/Sounds.hpp"
 #include "Environment/Terrain.hpp"
 #include "Graphic/gamegl.hpp"
 #include "Graphic/Models.hpp"
@@ -43,8 +44,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 +56,29 @@ struct InvalidPersonException : public exception {
    }
 };
 
+class PersonType
+{
+public:
+    // head, body, arms, legs
+    XYZ proportions[4];
+    animation_type animRun;
+    animation_type animRunning;
+    animation_type animCrouch;
+    animation_type animStop;
+    animation_type animLanding;
+    animation_type animLandingHard;
+    sound_type soundsAttack[4];
+    sound_type soundsTalk[2];
+
+    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 +120,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 +355,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();