From: Rudolf Polzer <divverent@xonotic.org>
Date: Thu, 22 Nov 2012 13:44:36 +0000 (+0100)
Subject: include CSAD code in client compilation too. Not used yet.
X-Git-Tag: xonotic-v0.7.0~99^2~37
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=eef3e55b80e604c4226ca5866446b5ce23e13d2c;p=xonotic%2Fxonotic-data.pk3dir.git

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

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 0d4513f92..74baf61fd 100644
--- 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 9c87d13ad..24ec0a2e3 100644
--- 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 0922433ee..8c98a07b7 100644
--- 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 331e464b8..79fd219a2 100644
--- 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 9b5608025..a9c3859cf 100644
--- 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 b07cae271..9f4c22a02 100644
--- 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