From: TimePath <andrew.hardaker1995@gmail.com>
Date: Mon, 4 Jan 2016 03:52:52 +0000 (+1100)
Subject: Self: purge
X-Git-Tag: xonotic-v0.8.2~1295
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b8ff74c37e78baa0fbb0d923d03ee0915f31ecd7;p=xonotic%2Fxonotic-data.pk3dir.git

Self: purge
---

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 464ae689a..768219833 100644
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -330,8 +330,8 @@ float CSQC_InputEvent(float bInputType, float nPrimary, float nSecondary)
 .void(entity) predraw_qc;
 void PreDraw_self()
 {
-	if(self.predraw_qc)
-		self.predraw_qc(self);
+	SELFPARAM();
+	if (this.predraw_qc) this.predraw_qc(this);
 }
 
 void setpredraw(entity this, void(entity) pdfunc)
diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 17dbf0ba9..4eab4c5c5 100644
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -864,7 +864,7 @@ void HUD_Crosshair()
 {SELFPARAM();
 	static float rainbow_last_flicker;
 	static vector rainbow_prev_color;
-	entity e = self;
+	entity e = this;
 	float f, i, j;
 	vector v;
 	if(!scoreboard_active && !camera_active && intermission != 2 &&
@@ -1404,8 +1404,8 @@ void CSQC_UpdateView(float w, float h)
 	else
 		view_quality = 1;
 
-	button_attack2 = PHYS_INPUT_BUTTON_ATCK2(self);
-	button_zoom = PHYS_INPUT_BUTTON_ZOOM(self);
+	button_attack2 = PHYS_INPUT_BUTTON_ATCK2(this);
+	button_zoom = PHYS_INPUT_BUTTON_ZOOM(this);
 
 	vf_size = getpropertyvec(VF_SIZE);
 	vf_min = getpropertyvec(VF_MIN);
diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc
index 5ab446f05..c0f644b80 100644
--- a/qcsrc/client/weapons/projectile.qc
+++ b/qcsrc/client/weapons/projectile.qc
@@ -22,7 +22,11 @@ void SUB_Stop(entity this)
 	this.move_movetype = MOVETYPE_NONE;
 }
 
-void SUB_Stop_self() { SUB_Stop(self); }
+void SUB_Stop_self()
+{
+	SELFPARAM();
+	SUB_Stop(this);
+}
 
 void Projectile_ResetTrail(entity this, vector to)
 {