From: Mario <mario.mario@y7mail.com>
Date: Wed, 29 Jun 2022 14:34:55 +0000 (+1000)
Subject: Remove cl_useenginerefdef and sv_qcphysics options, make the QuakeC implementations... 
X-Git-Tag: xonotic-v0.8.6~230^2~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=441dbe04e83e803d67407dd57b2212049b3fb305;p=xonotic%2Fxonotic-data.pk3dir.git

Remove cl_useenginerefdef and sv_qcphysics options, make the QuakeC implementations the default use case
---

diff --git a/qcsrc/common/physics/movetypes/movetypes.qc b/qcsrc/common/physics/movetypes/movetypes.qc
index 48aa9dd10..c311f6f14 100644
--- a/qcsrc/common/physics/movetypes/movetypes.qc
+++ b/qcsrc/common/physics/movetypes/movetypes.qc
@@ -4,11 +4,7 @@
 void set_movetype(entity this, int mt)
 {
 	this.move_movetype = mt;
-	if (mt == MOVETYPE_PHYSICS) {
-		this.move_qcphysics = false;
-	} else if (autocvar_sv_qcphysics == 2) {
-		this.move_qcphysics = true;
-	}
+	this.move_qcphysics = (mt != MOVETYPE_PHYSICS);
 	if(!IL_CONTAINS(g_moveables, this))
 		IL_PUSH(g_moveables, this); // add it to the moveable entities list (even if it doesn't move!) logic: if an object never sets its movetype, we assume it never does anything notable
 	this.movetype = (this.move_qcphysics) ? MOVETYPE_QCENTITY : mt;
diff --git a/qcsrc/common/physics/movetypes/movetypes.qh b/qcsrc/common/physics/movetypes/movetypes.qh
index 79b0ea7ba..d3de0ba9c 100644
--- a/qcsrc/common/physics/movetypes/movetypes.qh
+++ b/qcsrc/common/physics/movetypes/movetypes.qh
@@ -3,8 +3,6 @@
 #ifdef SVQC
 // undefined on client, engine cvar
 bool autocvar_physics_ode;
-
-int autocvar_sv_qcphysics = 1; // TODO this is for testing - remove when qcphysics work
 #endif
 
 // water levels
diff --git a/qcsrc/lib/csqcmodel/cl_player.qc b/qcsrc/lib/csqcmodel/cl_player.qc
index 5b35bfa4e..12e47cfa6 100644
--- a/qcsrc/lib/csqcmodel/cl_player.qc
+++ b/qcsrc/lib/csqcmodel/cl_player.qc
@@ -548,8 +548,6 @@ void CSQCPlayer_CalcRefdef(entity this)
 	setproperty(VF_ANGLES, view_angles);
 }
 
-bool autocvar_cl_useenginerefdef = false;
-
 /** Called once per CSQC_UpdateView() */
 void CSQCPlayer_SetCamera()
 {
@@ -631,20 +629,7 @@ void CSQCPlayer_SetCamera()
 			InterpolateOrigin_Do(view);
 			view.view_ofs = '0 0 1' * vh;
 		}
-		if(autocvar_cl_useenginerefdef)
-		{
-			int refdefflags = 0;
-			if (view.csqcmodel_teleported) refdefflags |= REFDEFFLAG_TELEPORTED;
-			if (input_buttons & BIT(1)) refdefflags |= REFDEFFLAG_JUMPING;
-			// note: these two only work in WIP2, but are harmless in WIP1
-			if (PHYS_HEALTH(NULL) <= 0 && PHYS_HEALTH(NULL) != -666 && PHYS_HEALTH(NULL) != -2342) refdefflags |= REFDEFFLAG_DEAD;
-			if (intermission) refdefflags |= REFDEFFLAG_INTERMISSION;
-			V_CalcRefdef(view, refdefflags); // TODO? uses .health stat in the engine when this isn't called here, may be broken!
-		}
-		else
-		{
-			CSQCPlayer_CalcRefdef(view);
-		}
+		CSQCPlayer_CalcRefdef(view);
 	}
 	else
 	{
diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 2e6e9e6b8..993739e15 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -1162,7 +1162,7 @@ void ClientConnect(entity this)
 	if (IS_REAL_CLIENT(this))
 		sv_notice_join(this);
 
-	this.move_qcphysics = autocvar_sv_qcphysics;
+	this.move_qcphysics = true;
 
 	// update physics stats (players can spawn before physics runs)
 	Physics_UpdateStats(this);
diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index 7a0dec689..e5e5df3ec 100644
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -909,8 +909,6 @@ seta cl_vaporizerbeam_colorboost 0.7 "saturation of the vaporizer beam's color b
 
 seta cl_showspectators 0 "Show who's spectating you if server has sv_showspectators enabled"
 
-set cl_useenginerefdef 0
-
 set cl_rollkillspeed 10
 
 // Facility for config.cfg use ONLY.