Update uses of self

diff --git a/qcsrc/server/mutators/mutator_instagib.qc b/qcsrc/server/mutators/mutator_instagib.qc
index 9aecd0e4e7e9917cbbd12bf1a04b359c8f9ad85e..1e2afb3529bd21dc4a8c28d038411d2e50be7d1c 100644 (file)
--- a/qcsrc/server/mutators/mutator_instagib.qc
+++ b/qcsrc/server/mutators/mutator_instagib.qc
@@ -15,7 +15,7 @@ void spawnfunc_item_minst_cells()
 }
 
 void instagib_invisibility()
-{
+{SELFPARAM();
        self.strength_finished = autocvar_g_balance_powerup_strength_time;
        StartItemA(ITEM_Invisibility);
 }
@@ -27,7 +27,7 @@ void instagib_extralife()
 }
 
 void instagib_speed()
-{
+{SELFPARAM();
        self.invincible_finished = autocvar_g_balance_powerup_invincible_time;
        StartItemA(ITEM_Speed);
 }

diff --git a/qcsrc/server/mutators/mutator_physical_items.qc b/qcsrc/server/mutators/mutator_physical_items.qc
index d02158ffc1496a22305c9ab02e79e0eeae1819b3..0fc96a1347cdb7697fd73f5453458aa25522e25c 100644 (file)
--- a/qcsrc/server/mutators/mutator_physical_items.qc
+++ b/qcsrc/server/mutators/mutator_physical_items.qc
@@ -100,9 +100,7 @@ MUTATOR_HOOKFUNCTION(item_spawning)
                setorigin(wep, wep.origin + '0 0 1');
                entity oldself;
                oldself = self;
-               self = wep;
-               builtin_droptofloor();
-               self = oldself;
+               WITH(entity, self, wep, builtin_droptofloor());
        }
 
        wep.spawn_origin = wep.origin;

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 671f1d0eda5cc63d49f9e380ddab6cd56ddf3310..df03b453805661403b07af6e9bcf9c813c4a3b17 100644 (file)
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -76,7 +76,7 @@ void ItemDrawSimple()
 }
 
 void Item_PreDraw()
-{
+{SELFPARAM();
        vector org;
        float alph;
        org = getpropertyvec(VF_ORIGIN);