X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FObjects%2FPerson.hpp;h=322bdeedb142c3552c4e64f1f6f0d8ac4bb32725;hb=032eb3ccf8e2ccc6a150ac2765eb56daef77942e;hp=1b9a01c8f079b1d997f94b1eca7a2980302fa397;hpb=ce14053e72f4d03078e8d5e8b22721feafb0bd20;p=lugaru.git
diff --git a/Source/Objects/Person.hpp b/Source/Objects/Person.hpp
index 1b9a01c..322bdee 100644
--- a/Source/Objects/Person.hpp
+++ b/Source/Objects/Person.hpp
@@ -23,12 +23,12 @@ along with Lugaru. If not, see .
#include "Animation/Animation.hpp"
#include "Animation/Skeleton.hpp"
-#include "Audio/Sounds.hpp"
#include "Environment/Terrain.hpp"
#include "Graphic/gamegl.hpp"
#include "Graphic/Models.hpp"
#include "Graphic/Sprite.hpp"
#include "Math/XYZ.hpp"
+#include "Objects/PersonType.hpp"
#include "Objects/Weapons.hpp"
#include
@@ -44,43 +44,12 @@ along with Lugaru. If not, see .
#define getweapontype 7
#define pathfindtype 8
-enum person_type
-{
- rabbittype = 0,
- wolftype = 1
-};
-
struct InvalidPersonException : public exception {
const char * what () const throw () {
return "Invalid weapon number";
}
};
-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];
-
- std::string figureFileName;
- std::string lowFigureFileName;
- std::string clothesFileName;
- std::string modelFileNames[7];
- std::string lowModelFileName;
- std::string modelClothesFileName;
-
- static std::vector types;
- static void Load();
-};
-
class Person : public enable_shared_from_this
{
private:
@@ -362,8 +331,9 @@ 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 setProportions(float head, float body, float arms, float legs);
+ float getProportion(int part) const;
+ XYZ getProportionXYZ(int part) const;
void CheckKick();
void CatchFire();