Kill the ret_string global

[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..903d1de255e0d1a34ab31d568ee78c410a4ac06d 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -187,7 +187,7 @@ void FixPlayermodel(entity player);
 void PutObserverInServer()
 {
        SELFPARAM();
-    bool mutator_returnvalue = MUTATOR_CALLHOOK(MakePlayerObserver);
+    bool mutator_returnvalue = MUTATOR_CALLHOOK(MakePlayerObserver, this);
        PlayerState_detach(this);
 
        if (IS_PLAYER(this) && this.health >= 1) {
@@ -385,8 +385,8 @@ void FixPlayermodel(entity player)
        }
 
        MUTATOR_CALLHOOK(FixPlayermodel, defaultmodel, defaultskin);
-       defaultmodel = ret_string;
-       defaultskin = ret_int;
+       defaultmodel = M_ARGV(0, string);
+       defaultskin = M_ARGV(1, int);
 
        bool chmdl = false;
        int oldskin;
@@ -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);
@@ -1191,7 +1191,7 @@ void ClientDisconnect()
 
        Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_QUIT_DISCONNECT, this.netname);
 
-    MUTATOR_CALLHOOK(ClientDisconnect);
+    MUTATOR_CALLHOOK(ClientDisconnect, this);
 
        ClientState_detach(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);
 }