X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FPerson.h;h=1749a565791c561d4936c3940edb3d178feb62d8;hb=4b65ff967257d8cfd673257e464c3e3e35822ec1;hp=5c5a96983c2c17abffd02dc568d22232c8736183;hpb=d5ff767196019eeb0001f921365bb1e4060eee5b;p=lugaru.git diff --git a/Source/Person.h b/Source/Person.h index 5c5a969..1749a56 100644 --- a/Source/Person.h +++ b/Source/Person.h @@ -33,6 +33,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "Sprite.h" #include #include "Weapons.h" +#include "Animation.h" #define passivetype 0 #define guardtype 1 @@ -322,13 +323,25 @@ class Person void DoBloodBig(float howmuch, int which); bool DoBloodBigWhere(float howmuch, int which, XYZ where); - bool wasIdle(); - bool isIdle(); + bool wasIdle() + { + return animation_bits[currentanimation] & ab_idle; + } + bool isIdle() + { + return animation_bits[targetanimation] & ab_idle; + } int getIdle(); - bool isSitting(); - bool isSleeping(); - + bool isSitting() + { + return animation_bits[targetanimation] & ab_sit; + } + + bool isSleeping() + { + return animation_bits[targetanimation] & ab_sleep; + } bool wasCrouch(); bool isCrouch();