X-Git-Url: https://git.jsancho.org/?p=lugaru.git;a=blobdiff_plain;f=Source%2FObjects%2FPerson.hpp;h=22c76eb17c4e82fd9038352c5e35ad2b022067b4;hp=beaf11c17873f35e3b961953d507b463c48a6911;hb=29b23632dbddbb74ca9c74e3229c5e4729fe3622;hpb=ce51a88a16d2e7af222929546d250eba4acb299d diff --git a/Source/Objects/Person.hpp b/Source/Objects/Person.hpp index beaf11c..22c76eb 100644 --- a/Source/Objects/Person.hpp +++ b/Source/Objects/Person.hpp @@ -157,6 +157,7 @@ public: std::shared_ptr victim; bool hasvictim; + bool isplayerfriend; float updatedelay; float normalsupdatedelay; @@ -318,7 +319,7 @@ public: Person(); Person(FILE*, int, unsigned); - void skeletonLoad(bool clothes = false); + void skeletonLoad(); // convenience functions inline Joint& joint(int bodypart) { return skeleton.joints[skeleton.jointlabels[bodypart]]; } @@ -400,6 +401,12 @@ public: void addClothes(); void doAI(); + + bool catchKnife(); + + bool hasWeapon() { return (weaponactive != -1); } + bool isPlayerControlled() { return (aitype == playercontrolled); } + bool isPlayerFriend() { return isplayerfriend; } }; const int maxplayers = 10;