From df8a2bd2d26f416dba3b1b074cf84c09e3758b01 Mon Sep 17 00:00:00 2001 From: TimePath Date: Sat, 5 Sep 2015 12:10:53 +1000 Subject: [PATCH 1/1] Update uses of self --- qcsrc/server/mutators/mutator_instagib.qc | 4 ++-- qcsrc/server/mutators/mutator_physical_items.qc | 4 +--- qcsrc/server/t_items.qc | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/qcsrc/server/mutators/mutator_instagib.qc b/qcsrc/server/mutators/mutator_instagib.qc index 9aecd0e4e7..1e2afb3529 100644 --- 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 d02158ffc1..0fc96a1347 100644 --- 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 671f1d0eda..df03b45380 100644 --- 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); -- 2.39.2