From: terencehill <piuntn@gmail.com>
Date: Mon, 16 Mar 2020 12:05:38 +0000 (+0100)
Subject: Misc cleanups (comment in CCR is no longer valid, autocvar declarations are right... 
X-Git-Tag: xonotic-v0.8.5~1133^2~20
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=adec716d67b8694d94ee267fd24c6ffcac85f32d;p=xonotic%2Fxonotic-data.pk3dir.git

Misc cleanups (comment in CCR is no longer valid, autocvar declarations are right above CCR)
---

diff --git a/qcsrc/common/weapons/weapon/vaporizer.qc b/qcsrc/common/weapons/weapon/vaporizer.qc
index dbf24c796..cfdbe7b7e 100644
--- a/qcsrc/common/weapons/weapon/vaporizer.qc
+++ b/qcsrc/common/weapons/weapon/vaporizer.qc
@@ -33,7 +33,6 @@ void Draw_VaporizerBeam_trace_callback(vector start, vector hit, vector end)
 }
 
 .vector vorg1, vorg2;
-.float spawn_time;
 void VaporizerBeam_Draw(entity this)
 {
 	//draw either the old v2.3 beam or the new beam
diff --git a/qcsrc/lib/csqcmodel/cl_player.qc b/qcsrc/lib/csqcmodel/cl_player.qc
index 04a3c2b74..25fd5cdfa 100644
--- a/qcsrc/lib/csqcmodel/cl_player.qc
+++ b/qcsrc/lib/csqcmodel/cl_player.qc
@@ -596,7 +596,6 @@ void CSQCPlayer_SetCamera()
 		{
 			CSQCPlayer_CalcRefdef(view);
 		}
-			
 	}
 	else
 	{
diff --git a/qcsrc/lib/csqcmodel/cl_player.qh b/qcsrc/lib/csqcmodel/cl_player.qh
index 297e2e69d..92948dc5a 100644
--- a/qcsrc/lib/csqcmodel/cl_player.qh
+++ b/qcsrc/lib/csqcmodel/cl_player.qh
@@ -35,7 +35,7 @@ const int PMF_JUMP_HELD = 1;
 //const int PMF_DUCKED = 4;
 //const int PMF_ONGROUND = 8;
 
-const int FL_DUCKED = 524288;
+const int FL_DUCKED = BIT(19);
 
 void CSQCPlayer_SetCamera();
 float CSQCPlayer_PreUpdate(entity this);
diff --git a/qcsrc/lib/string.qh b/qcsrc/lib/string.qh
index c4b594d40..a7508b8fb 100644
--- a/qcsrc/lib/string.qh
+++ b/qcsrc/lib/string.qh
@@ -127,8 +127,6 @@ string autocvar_hud_colorset_background = "7";   // BG - White // neutral/unimpo
 /** color code replace, place inside of sprintf and parse the string */
 string CCR(string input)
 {
-	// See the autocvar declarations in util.qh for default values
-
 	// foreground/normal colors
 	input = strreplace("^F1", strcat("^", autocvar_hud_colorset_foreground_1), input);
 	input = strreplace("^F2", strcat("^", autocvar_hud_colorset_foreground_2), input);
diff --git a/qcsrc/server/pathlib/main.qc b/qcsrc/server/pathlib/main.qc
index fc550fa63..4cb8a3806 100644
--- a/qcsrc/server/pathlib/main.qc
+++ b/qcsrc/server/pathlib/main.qc
@@ -289,7 +289,7 @@ void pathlib_cleanup()
 
 float Cosine_Interpolate(float a, float b, float c)
 {
-	float ft = c * 3.1415927;
+	float ft = c * M_PI;
 	float f = (1 - cos(ft)) * 0.5;
 
 	return a*(1-f) + b*f;