X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fwarpzonelib%2Fclient.qc;h=85fbdd933e6e2453447d1b144f2663d92bc4a598;hp=c2a110b4a14dd829fdc06618e6c669653e29074f;hb=a8cc9eb71b0d0e44e9a968a9cf5554f6226cc838;hpb=e449f70197479ad384431f4cd1a23d994a8eb928

diff --git a/qcsrc/warpzonelib/client.qc b/qcsrc/warpzonelib/client.qc
index c2a110b4a..85fbdd933 100644
--- a/qcsrc/warpzonelib/client.qc
+++ b/qcsrc/warpzonelib/client.qc
@@ -1,13 +1,19 @@
+#include "client.qh"
+#include "common.qh"
+
+#if defined(CSQC)
+	#include "../client/autocvars.qh"
+	#include "../csqcmodellib/cl_model.qh"
+	#include "../dpdefs/csprogsdefs.qh"
+#elif defined(MENUQC)
+#elif defined(SVQC)
+#endif
+
 void WarpZone_Fade_PreDraw()
-{
+{SELFPARAM();
 	vector org;
 	org = getpropertyvec(VF_ORIGIN);
-	if(
-#ifdef COMPAT_XON060_DONTCRASH_CHECKPVS
-		cvar_string("g_xonoticversion") != "0.5.0" &&
-		cvar_string("g_xonoticversion") != "0.6.0" &&
-#endif
-		!checkpvs(org, self)) // this makes sense as long as we don't support recursive warpzones
+	if(!checkpvs(org, self)) // this makes sense as long as we don't support recursive warpzones
 		self.alpha = 0;
 	else if(self.warpzone_fadestart)
 		self.alpha = bound(0, (self.warpzone_fadeend - vlen(org - self.origin - 0.5 * (self.mins + self.maxs))) / (self.warpzone_fadeend - self.warpzone_fadestart), 1);
@@ -21,9 +27,7 @@ void WarpZone_Fade_PreDraw()
 }
 
 void WarpZone_Read(float isnew)
-{
-	float f;
-
+{SELFPARAM();
 	warpzone_warpzones_exist = 1;
 	if (!self.enemy)
 	{
@@ -32,7 +36,7 @@ void WarpZone_Read(float isnew)
 	}
 	self.classname = "trigger_warpzone";
 
-	f = ReadByte();
+	int f = ReadByte();
 	self.warpzone_isboxy = (f & 1);
 	if(f & 4)
 	{
@@ -88,12 +92,11 @@ void WarpZone_Read(float isnew)
 }
 
 void WarpZone_Camera_Read(float isnew)
-{
-	float f;
+{SELFPARAM();
 	warpzone_cameras_exist = 1;
 	self.classname = "func_warpzone_camera";
 
-	f = ReadByte();
+	int f = ReadByte();
 	if(f & 4)
 	{
 		self.origin_x = ReadCoord();
@@ -146,12 +149,12 @@ void WarpZone_Camera_Read(float isnew)
 
 void CL_RotateMoves(vector ang) = #638;
 void WarpZone_Teleported_Read(float isnew)
-{
+{SELFPARAM();
 	vector v;
 	self.classname = "warpzone_teleported";
-	v_x = ReadCoord();
-	v_y = ReadCoord();
-	v_z = ReadCoord();
+	v.x = ReadCoord();
+	v.y = ReadCoord();
+	v.z = ReadCoord();
 	if(!isnew)
 		return;
 	self.warpzone_transform = v;
@@ -163,7 +166,6 @@ void WarpZone_Teleported_Read(float isnew)
 
 float warpzone_fixingview;
 float warpzone_fixingview_drawexteriormodel;
-float autocvar_chase_active;
 
 void WarpZone_View_Outside()
 {
@@ -193,12 +195,12 @@ vector WarpZone_FixNearClip(vector o, vector c0, vector c1, vector c2, vector c3
 	entity e;
 	float pd;
 
-	mi_x = min(o_x, c0_x, c1_x, c2_x, c3_x);
-	ma_x = max(o_x, c0_x, c1_x, c2_x, c3_x);
-	mi_y = min(o_y, c0_y, c1_y, c2_y, c3_y);
-	ma_y = max(o_y, c0_y, c1_y, c2_y, c3_y);
-	mi_z = min(o_z, c0_z, c1_z, c2_z, c3_z);
-	ma_z = max(o_z, c0_z, c1_z, c2_z, c3_z);
+	mi.x = min(o.x, c0_x, c1_x, c2_x, c3_x);
+	ma.x = max(o.x, c0_x, c1_x, c2_x, c3_x);
+	mi.y = min(o.y, c0_y, c1_y, c2_y, c3_y);
+	ma.y = max(o.y, c0_y, c1_y, c2_y, c3_y);
+	mi.z = min(o.z, c0_z, c1_z, c2_z, c3_z);
+	ma.z = max(o.z, c0_z, c1_z, c2_z, c3_z);
 
 	e = WarpZone_Find(mi, ma);
 	if(e)
@@ -231,7 +233,7 @@ void WarpZone_FixPMove()
 }
 
 #ifndef KEEP_ROLL
-var float autocvar_cl_rollkillspeed = 10;
+float autocvar_cl_rollkillspeed = 10;
 #endif
 void WarpZone_FixView()
 {
@@ -241,19 +243,12 @@ void WarpZone_FixView()
 
 	warpzone_save_view_origin = org = getpropertyvec(VF_ORIGIN);
 	warpzone_save_view_angles = ang = getpropertyvec(VF_ANGLES);
-#ifdef WORKAROUND_XON010
-	float dirty;
-	dirty = checkextension("DP_CSQC_ROTATEMOVES");
-#endif
 
 	e = WarpZone_Find(org, org);
 	if(e)
 	{
 		org = WarpZone_TransformOrigin(e, org);
 		ang = WarpZone_TransformVAngles(e, ang);
-#ifdef WORKAROUND_XON010
-		dirty = 1;
-#endif
 		WarpZone_View_Inside();
 	}
 	else
@@ -269,23 +264,11 @@ void WarpZone_FixView()
 	rick = getproperty(VF_CL_VIEWANGLES_Z);
 	rick *= f;
 	setproperty(VF_CL_VIEWANGLES_Z, rick);
-
-#ifdef WORKAROUND_XON010
-	if(ang_z > 1 || ang_z < -1)
-		dirty = 1;
-#endif
-	ang_z *= f;
+	ang.z *= f;
 #endif
 
-#ifdef WORKAROUND_XON010
-	if(dirty)
-	{
-#endif
 	setproperty(VF_ORIGIN, org);
 	setproperty(VF_ANGLES, ang);
-#ifdef WORKAROUND_XON010
-	}
-#endif
 
 	nearclip = '0 0 1' * (cvar("r_nearclip") * 1.125);
 	corner0 = cs_unproject('0 0 0' + nearclip);