Merge remote-tracking branch 'origin/terencehill/menu_translation_percentage'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / animdecide.qh

diff --git a/qcsrc/common/animdecide.qh b/qcsrc/common/animdecide.qh
index fa010111bbd64d98059b9bd96b2ce3b52e270bd5..105dac7c47f2460a8710a54c87032a5b469eb1dd 100644 (file)
--- a/qcsrc/common/animdecide.qh
+++ b/qcsrc/common/animdecide.qh
@@ -1,12 +1,24 @@
 // client side frame inferring
 void animdecide_init(entity e);
-void animdecide_setframes(entity e, float support_blending);
+
+void animdecide_setimplicitstate(entity e, float onground);
+void animdecide_setframes(entity e, float support_blending, .float fld_frame, .float fld_frame1time, .float fld_frame2, .float fld_frame2time);
 
 // please network this one
 .float anim_state;
 .float anim_time;
-#define ReadAnimState() do { self.anim_state = ReadByte(); self.anim_time = ReadApproxPastTime(); } while(0)
-#define WriteAnimState(dest) do { WriteByte(dest, self.anim_state); WriteApproxPastTime(dest, self.anim_time); } while(0)
+.float anim_lower_action;
+.float anim_lower_time;
+.float anim_upper_action;
+.float anim_upper_time;
+
+// when copying entities, copy these too
+.float anim_implicit_state;
+.float anim_implicit_time;
+.float anim_lower_implicit_action;
+.float anim_lower_implicit_time;
+.float anim_upper_implicit_action;
+.float anim_upper_implicit_time;
 
 // explicit anim states (networked)
 void animdecide_setstate(entity e, float newstate, float restart);
@@ -21,6 +33,7 @@ void animdecide_setstate(entity e, float newstate, float restart);
 #define ANIMIMPLICITSTATE_BACKWARDS 4
 #define ANIMIMPLICITSTATE_LEFT 8
 #define ANIMIMPLICITSTATE_RIGHT 16
+#define ANIMIMPLICITSTATE_JUMPRELEASED 32
 
 // explicit actions (networked); negative values are for lower body
 void animdecide_setaction(entity e, float action, float restart);