Kill the ret_string global

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

diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc
index efefcd17aaa26cf16897100a0123270dba7eba42..8c4126cf4639811d7b65ce35c7299e5d2557248a 100644 (file)
--- a/qcsrc/server/scores.qc
+++ b/qcsrc/server/scores.qc
@@ -333,8 +333,8 @@ void PlayerScore_Detach(entity player)
 
 float PlayerScore_Add(entity player, float scorefield, float score)
 {
-       bool mutator_returnvalue = MUTATOR_CALLHOOK(AddPlayerScore, scorefield, score);
-       score = ret_float;
+       bool mutator_returnvalue = MUTATOR_CALLHOOK(AddPlayerScore, scorefield, score, player);
+       score = M_ARGV(1, float);
 
        if(gameover)
        if(!mutator_returnvalue)
@@ -531,19 +531,15 @@ void WinningConditionHelper()
                {
                        s = GetPlayerScoreString(it, 1);
                        s = strcat(s, IS_REAL_CLIENT(it) ? ":human" : ":bot");
-                       ret_string = string_null;
-                       if(!IS_PLAYER(it) && !MUTATOR_CALLHOOK(GetPlayerStatus, it, s))
+                       if(!IS_PLAYER(it) && !MUTATOR_CALLHOOK(GetPlayerStatus, it))
                                s = strcat(s, ":spectator");
-                       if (ret_string) s = strcat(s, ret_string);
                }
                else
                {
-                       ret_string = string_null;
-                       if (IS_PLAYER(it) || MUTATOR_CALLHOOK(GetPlayerStatus, it, s))
+                       if (IS_PLAYER(it) || MUTATOR_CALLHOOK(GetPlayerStatus, it))
                                s = GetPlayerScoreString(it, 2);
                        else
                                s = "-666";
-                       if (ret_string) s = strcat(s, ret_string);
                }
 
                if(it.clientstatus)