From adec716d67b8694d94ee267fd24c6ffcac85f32d Mon Sep 17 00:00:00 2001 From: terencehill Date: Mon, 16 Mar 2020 13:05:38 +0100 Subject: [PATCH] Misc cleanups (comment in CCR is no longer valid, autocvar declarations are right above CCR) --- qcsrc/common/weapons/weapon/vaporizer.qc | 1 - qcsrc/lib/csqcmodel/cl_player.qc | 1 - qcsrc/lib/csqcmodel/cl_player.qh | 2 +- qcsrc/lib/string.qh | 2 -- qcsrc/server/pathlib/main.qc | 2 +- 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/qcsrc/common/weapons/weapon/vaporizer.qc b/qcsrc/common/weapons/weapon/vaporizer.qc index dbf24c7964..cfdbe7b7e9 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 04a3c2b740..25fd5cdfa1 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 297e2e69d6..92948dc5a9 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 c4b594d40f..a7508b8fb8 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 fc550fa636..4cb8a3806c 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; -- 2.39.2