Simplify land animations

[lugaru.git] / Source / Person.h

diff --git a/Source/Person.h b/Source/Person.h
index 10f6ab2808d96779aac7119e180fc870109957b0..56d4f5490b87fe0562558594702b723037d25f97 100644 (file)
--- a/Source/Person.h
+++ b/Source/Person.h
@@ -333,28 +333,58 @@ class Person
                }
                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();