Merge remote branch 'origin/fruitiex/balance'

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

diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc
index 30adf39fb1fffb24a90af13c24fdfa9302228885..fbddca71df4438742f9e125f57bc458e2cf42173 100644 (file)
--- a/qcsrc/server/scores.qc
+++ b/qcsrc/server/scores.qc
@@ -324,7 +324,8 @@ float PlayerScore_Add(entity player, float scorefield, float score)
        {
                if(gameover)
                        return 0;
-               error("Adding score to unknown player!");
+               backtrace("Adding score to unknown player!");
+               return 0;
        }
        if(score)
                if(scores_label[scorefield] != "")
@@ -367,8 +368,9 @@ void WinningConditionHelper()
        entity sk;
 
        s = GetGametype();
-       s = strcat(s, ":", cvar_string("g_nexuizversion"));
-       s = strcat(s, "::", GetPlayerScoreString(world, 2)); // make this 1 once we can
+       s = strcat(s, ":", cvar_string("g_xonoticversion"));
+       s = strcat(s, ":P", ftos(cvar_purechanges_count));
+       s = strcat(s, "::", GetPlayerScoreString(world, 1)); // make this 1 once we can, note: this doesn't contain any :<letter>
 
        fullstatus = cvar("g_full_getstatus_responses");