Cleanse PlayerUseKey and PlayerPreThink

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / mutator / gamemode_keyhunt.qc

diff --git a/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc b/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
index 9b4c7586c5148312b5d06e5522fb07c224a965e3..5f4c2e76d84b66469bfa683bd9a06c6d0881f8f8 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
@@ -1346,18 +1346,19 @@ MUTATOR_HOOKFUNCTION(kh, SpectateCopy)
 }
 
 MUTATOR_HOOKFUNCTION(kh, PlayerUseKey)
-{SELFPARAM();
+{
+       entity player = M_ARGV(0, entity);
+
        if(MUTATOR_RETURNVALUE == 0)
        {
-               entity k;
-               k = self.kh_next;
+               entity k = player.kh_next;
                if(k)
                {
                        kh_Key_DropOne(k);
-                       return 1;
+                       return true;
                }
        }
-       return 0;
+       return false;
 }
 
 MUTATOR_HOOKFUNCTION(kh, HavocBot_ChooseRole)