X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FPerson.h;h=56d4f5490b87fe0562558594702b723037d25f97;hb=fe7e2a8681a5988af06f7cbd24b3c8cc447b0738;hp=5c5a96983c2c17abffd02dc568d22232c8736183;hpb=d5ff767196019eeb0001f921365bb1e4060eee5b;p=lugaru.git

diff --git a/Source/Person.h b/Source/Person.h
index 5c5a969..56d4f54 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 <cmath>
 #include "Weapons.h"
+#include "Animation.h"
 
 #define passivetype 0
 #define guardtype 1
@@ -322,32 +323,68 @@ 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 wasCrouch();
-		bool isCrouch();
+		bool isSitting()
+		{
+		  return animation_bits[targetanimation] & ab_sit;
+		}
+
+		bool isSleeping()
+		{
+		  return animation_bits[targetanimation] & ab_sleep;
+		}
+
+		bool wasCrouch()
+		{
+		  return animation_bits[currentanimation] & ab_crouch;
+		}
+		bool isCrouch()
+		{
+		  return animation_bits[targetanimation] & ab_crouch;
+		}
 		int getCrouch();
 		
-		bool wasStop();
-		bool isStop();
+		bool wasStop()
+		{
+		  return animation_bits[currentanimation] & ab_stop;
+		}
+		bool isStop()
+		{
+		  return animation_bits[targetanimation] & ab_stop;
+		}
 		int getStop();
 		
 		bool wasSneak();
 		bool isSneak();
 		int getSneak();
 		
-		bool wasRun();
-		bool isRun();
+		bool wasRun()
+		{
+		  return animation_bits[currentanimation] & ab_run;
+		}
+		bool isRun()
+		{
+		  return animation_bits[targetanimation] & ab_run;
+		}
 		int getRun();
-		
-		bool wasLanding();
-		bool isLanding();
+
+		bool wasLanding()
+		{
+		  return animation_bits[currentanimation] & ab_land;
+		}
+		bool isLanding()
+		{
+		  return animation_bits[targetanimation] & ab_land;
+		}
 		int getLanding();
 		
 		bool wasLandhard();