include CSAD code in client compilation too. Not used yet.

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 0d4513f92b802a351f83883eecd5ed8e430d1d2f..74baf61fd879a83d68ee1fc8fad7042ce0d33cdd 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -402,3 +402,4 @@ string autocvar__cl_playermodel;
 float autocvar_cl_precacheplayermodels;
 float autocvar_cl_deathglow;
 float autocvar_developer_csqcentities;
+float autocvar_sv_player_jumpanim_minfall;

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 9c87d13addf9949c671a4319da1e5c91f2f69b45..24ec0a2e36d3f938dab9ce41b944f86e9a3f2aef 100644 (file)
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -419,6 +419,8 @@ float EF_DIMLIGHT   = 8;
 float EF_DOUBLESIDED = 32768;
 float EF_NOSELFSHADOW = 65536;
 float EF_DYNAMICMODELLIGHT = 131072;
+float EF_RESTARTANIM_BIT = 1048576;
+float EF_TELEPORT_BIT = 2097152;
 float MF_ROCKET  =   1; // leave a trail
 float MF_GRENADE =   2; // leave a trail
 float MF_GIB     =   4; // leave a trail

diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src
index 0922433eebdecd2d6c3c229636162e1475c6e56b..8c98a07b709031647c733cf06539fcaa5e8e94ac 100644 (file)
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@ -23,6 +23,7 @@ Defs.qc
 ../common/command/generic.qh
 ../common/command/shared_defs.qh
 ../common/urllib.qh
+../common/animdecide.qh
 command/cl_cmd.qh
 
 autocvars.qh
@@ -111,4 +112,6 @@ command/cl_cmd.qc
 ../warpzonelib/client.qc
 tturrets.qc
 
+../common/animdecide.qc
+
 ../common/if-this-file-errors-scroll-up-and-fix-the-warnings.fteqccfail

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index 331e464b87a7d1f7b66df3554c02eb6834a8c315..79fd219a20dd88d7e525e055b25ceaf7d198fa11 100644 (file)
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -2472,3 +2472,16 @@ vector vec3(float x, float y, float z)
        v_z = z;
        return v;
 }
+
+vector animfixfps(entity e, vector a)
+{
+       // multi-frame anim: keep as-is
+       if(a_y == 1)
+       {
+               float dur;
+               dur = frameduration(e.modelindex, a_x);
+               if(dur > 0)
+                       a_z = 1.0 / dur;
+       }
+       return a;
+}

diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh
index 9b5608025cb9064f0f514831ea21dba49716a2ef..a9c3859cf76ec1dae20a32c0c829672b47e18441 100644 (file)
--- a/qcsrc/common/util.qh
+++ b/qcsrc/common/util.qh
@@ -363,3 +363,5 @@ typedef float(entity a, entity b, entity pass) isConnectedFunction_t;
 void FindConnectedComponent(entity e, .entity fld, findNextEntityNearFunction_t nxt, isConnectedFunction_t iscon, entity pass);
 
 vector vec3(float x, float y, float z);
+
+vector animfixfps(entity e, vector a);

diff --git a/qcsrc/server/g_subs.qc b/qcsrc/server/g_subs.qc
index b07cae2714e19770ca08d721d26fd0cec4885575..9f4c22a02697d9e72213b4fa0350a8c4b021bf91 100644 (file)
--- a/qcsrc/server/g_subs.qc
+++ b/qcsrc/server/g_subs.qc
@@ -58,19 +58,6 @@ void updateanim(entity e)
        //print(ftos(time), " -> ", ftos(e.frame), "\n");
 }
 
-vector animfixfps(entity e, vector a)
-{
-       // multi-frame anim: keep as-is
-       if(a_y == 1)
-       {
-               float dur;
-               dur = frameduration(e.modelindex, a_x);
-               if(dur > 0)
-                       a_z = 1.0 / dur;
-       }
-       return a;
-}
-
 /*
 ==================
 SUB_Remove