Remove SELFPARAM() from .think and .touch

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / weapons / weaponsystem.qc

diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc
index b7c81925f4d9a2407c1a85ea1cd8d9fd5d3c923b..97e008cc0ee487b21219d7bd23e35201769eb8e6 100644 (file)
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@ -62,9 +62,8 @@ vector CL_Weapon_GetShotOrg(int wpn)
 ..entity weaponentity_fld;
 .float m_alpha;
 
-void CL_Weaponentity_Think()
+void CL_Weaponentity_Think(entity this)
 {
-       SELFPARAM();
        this.nextthink = time;
        if (intermission_running) this.frame = this.anim_idle.x;
        .entity weaponentity = this.weaponentity_fld;
@@ -107,9 +106,8 @@ void CL_Weaponentity_Think()
        }
 }
 
-void CL_ExteriorWeaponentity_Think()
+void CL_ExteriorWeaponentity_Think(entity this)
 {
-       SELFPARAM();
        this.nextthink = time;
        if (this.owner.exteriorweaponentity != this)
        {
@@ -168,7 +166,7 @@ void CL_SpawnWeaponentity(entity actor, .entity weaponentity)
        setmodel(view, MDL_Null);  // precision set when changed
        setorigin(view, '0 0 0');
        view.weaponentity_fld = weaponentity;
-       view.think = CL_Weaponentity_Think;
+       setthink(view, CL_Weaponentity_Think);
        view.nextthink = time;
        view.viewmodelforclient = actor;
        view.customizeentityforclient = CL_Weaponentity_CustomizeEntityForClient;
@@ -179,7 +177,7 @@ void CL_SpawnWeaponentity(entity actor, .entity weaponentity)
                exterior.solid = SOLID_NOT;
                exterior.owner = actor;
                setorigin(exterior, '0 0 0');
-               exterior.think = CL_ExteriorWeaponentity_Think;
+               setthink(exterior, CL_ExteriorWeaponentity_Think);
                exterior.nextthink = time;
 
                CSQCMODEL_AUTOINIT(exterior);