Misc cleanups (comment in CCR is no longer valid, autocvar declarations are right...

diff --git a/qcsrc/common/weapons/weapon/vaporizer.qc b/qcsrc/common/weapons/weapon/vaporizer.qc
index dbf24c7964d94ff229b30ac068d4a0d315a251ba..cfdbe7b7e933461e0566c9a053255fe9f418da22 100644 (file)
--- 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;
 }
 
 .vector vorg1, vorg2;

-.float spawn_time;

 void VaporizerBeam_Draw(entity this)
 {
        //draw either the old v2.3 beam or the new beam
 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 04a3c2b74072e5391a198224b5a33a7658672e99..25fd5cdfa1d84874bf5bb70939ee35f027141e3b 100644 (file)
--- a/qcsrc/lib/csqcmodel/cl_player.qc
+++ b/qcsrc/lib/csqcmodel/cl_player.qc
@@ -596,7 +596,6 @@ void CSQCPlayer_SetCamera()
                {
                        CSQCPlayer_CalcRefdef(view);
                }
                {
                        CSQCPlayer_CalcRefdef(view);
                }

-                       

        }
        else
        {
        }
        else
        {

diff --git a/qcsrc/lib/csqcmodel/cl_player.qh b/qcsrc/lib/csqcmodel/cl_player.qh
index 297e2e69d648c1826289fa21c95e389f5a61b5f2..92948dc5a92d119b34485fe649823fa67f0960a6 100644 (file)
--- 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 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);
 
 void CSQCPlayer_SetCamera();
 float CSQCPlayer_PreUpdate(entity this);

diff --git a/qcsrc/lib/string.qh b/qcsrc/lib/string.qh
index c4b594d40fd846cf81b6e5e20de920abbb110642..a7508b8fb85c236f61619684dc1e692d5fec0859 100644 (file)
--- 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)
 {
 /** 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);
        // 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 fc550fa636f029bd2f0b1e596c44dbd0b15a6a2e..4cb8a3806c6883f32cb8550abc9388eda50cef5a 100644 (file)
--- 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 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;
        float f = (1 - cos(ft)) * 0.5;
 
        return a*(1-f) + b*f;