]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Remove the last SELFPARAM from client/
authorTimePath <andrew.hardaker1995@gmail.com>
Sat, 28 May 2016 07:34:19 +0000 (17:34 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sat, 28 May 2016 07:34:19 +0000 (17:34 +1000)
qcsrc/client/view.qc

index 4696b5ef520f979a310d6c890724f2307ba52552..f96998592aee0671b969ac20f54cd54df60b50b1 100644 (file)
@@ -922,9 +922,8 @@ LABEL(normalcolor)
        return wcross_color;
 }
 
-void HUD_Crosshair()
-{SELFPARAM();
-       entity e = this;
+void HUD_Crosshair(entity this)
+{
        float f, i, j;
        vector v;
        if(!scoreboard_active && !camera_active && intermission != 2 &&
@@ -981,6 +980,7 @@ void HUD_Crosshair()
                string wcross_name = "";
                float wcross_scale, wcross_blur;
 
+        entity e = this; // wtf?
                if(autocvar_crosshair_per_weapon || (autocvar_crosshair_color_special == 1))
                {
                        e = switchingweapon;
@@ -1307,7 +1307,7 @@ void HUD_Crosshair()
        }
 }
 
-void HUD_Draw()
+void HUD_Draw(entity this)
 {
        if(!intermission)
        if (MUTATOR_CALLHOOK(HUD_Draw_overlay))
@@ -1342,7 +1342,7 @@ void HUD_Draw()
 
        // crosshair goes VERY LAST
        UpdateDamage();
-       HUD_Crosshair();
+       HUD_Crosshair(this);
        HitSound();
 }
 
@@ -2171,7 +2171,7 @@ void CSQC_UpdateView(float w, float h)
 
        scoreboard_active = HUD_WouldDrawScoreboard();
 
-       HUD_Draw();
+       HUD_Draw(this);
 
        if(NextFrameCommand)
        {