Simplify landhard and flip animations

[lugaru.git] / Source / Person.h

diff --git a/Source/Person.h b/Source/Person.h
index e036f884925199ebb57583b0470c7fdced4a620a..a4eeae9bc457c6119ad6c47e645cc12bbd2c5217 100644 (file)
--- a/Source/Person.h
+++ b/Source/Person.h
@@ -337,36 +337,75 @@ class Person
                {
                  return animation_bits[targetanimation] & ab_sit;
                }
-               bool isSleeping();
-               
-               
-               bool wasCrouch();
-               bool isCrouch();
+
+               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();
-               bool isLandhard();
+
+               bool wasLandhard()
+               {
+                 return animation_bits[currentanimation] & ab_landhard;
+               }
+               bool isLandhard()
+               {
+                 return animation_bits[targetanimation] & ab_landhard;
+               }
                int getLandhard();
-               
-               bool isFlip();
-               bool wasFlip();
-               
+
+               bool wasFlip()
+               {
+                 return animation_bits[currentanimation] & ab_flip;
+               }
+               bool isFlip()
+               {
+                 return animation_bits[targetanimation] & ab_flip;;
+               }
+
                bool jumpclimb;
                
                bool isWallJump();