Purify PutClientInServer and PlayerSpawn mutator hooks

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / weaponarena_random / weaponarena_random.qc

diff --git a/qcsrc/common/mutators/mutator/weaponarena_random/weaponarena_random.qc b/qcsrc/common/mutators/mutator/weaponarena_random/weaponarena_random.qc
index 5c821007785c99d1fe66199ebc69f1e4b317d3f1..e4d400db7021e08e5f4384b039254e995b2ac890 100644 (file)
--- a/qcsrc/common/mutators/mutator/weaponarena_random/weaponarena_random.qc
+++ b/qcsrc/common/mutators/mutator/weaponarena_random/weaponarena_random.qc
@@ -2,12 +2,14 @@
 // WEAPONTODO: rename the cvars
 REGISTER_MUTATOR(weaponarena_random, true);
 
-MUTATOR_HOOKFUNCTION(weaponarena_random, PlayerSpawn) {
-    SELFPARAM();
+MUTATOR_HOOKFUNCTION(weaponarena_random, PlayerSpawn)
+{
     if (!g_weaponarena_random) return;
-    if (g_weaponarena_random_with_blaster) this.weapons &= ~WEPSET(BLASTER);
-    W_RandomWeapons(this, g_weaponarena_random);
-    if (g_weaponarena_random_with_blaster) this.weapons |= WEPSET(BLASTER);
+    entity player = M_ARGV(0, entity);
+
+    if (g_weaponarena_random_with_blaster) player.weapons &= ~WEPSET(BLASTER);
+    W_RandomWeapons(player, g_weaponarena_random);
+    if (g_weaponarena_random_with_blaster) player.weapons |= WEPSET(BLASTER);
 }
 
 #endif