Purify PutClientInServer and PlayerSpawn mutator hooks

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

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index ad9a1ec542cc085844f77e1905f337da70f29a59..6f0e1d3aecb94e2347fbe1c24ff8cba7af1e091a 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -635,7 +635,7 @@ void PutClientInServer()
 
                Unfreeze(this);
 
-               MUTATOR_CALLHOOK(PlayerSpawn, spot);
+               MUTATOR_CALLHOOK(PlayerSpawn, this, spot);
 
                if (autocvar_spawn_debug)
                {
@@ -1162,7 +1162,7 @@ void ClientConnect()
                sv_notice_join(this);
 
        FOREACH_ENTITY_FLOAT(init_for_player_needed, true, {
-               WITHSELF(it, it.init_for_player(it));
+               it.init_for_player(it, this);
        });
 
        MUTATOR_CALLHOOK(ClientConnect, this);
@@ -2321,7 +2321,7 @@ void PlayerPreThink ()
                if (frametime) player_anim();
 
                // secret status
-               secrets_setstatus();
+               secrets_setstatus(this);
 
                // monsters status
                monsters_setstatus(this);
@@ -2470,7 +2470,7 @@ void PlayerPostThink ()
                WaypointSprite_UpdateHealth(this.waypointsprite_attachedforcarrier, '1 0 0' * v);
     }
 
-       playerdemo_write();
+       playerdemo_write(this);
 
        CSQCMODEL_AUTOUPDATE(this);
 }