From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sat, 28 May 2016 07:34:19 +0000 (+1000)
Subject: Remove the last SELFPARAM from client/
X-Git-Tag: xonotic-v0.8.2~894
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d2b871e7eac957b6f57a88dc125a026ba2abce31;p=xonotic%2Fxonotic-data.pk3dir.git

Remove the last SELFPARAM from client/
---

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 4696b5ef5..f96998592 100644
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -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)
 	{