Self: purge

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 464ae689a14186f20486fb35ad9de835eb72d418..7682198338308463520b72a815e03e4b8cd91b0d 100644 (file)
--- 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 17dbf0ba96e03504549654490554adae99c87761..4eab4c5c551d2b9dcfffc41a2ec21bd662e60260 100644 (file)
--- 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 5ab446f05fd16ea6c66b5f00a7057f4b3ba02fd0..c0f644b806438677380a3ca075b41c303c171cfb 100644 (file)
--- 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)
 {