Merge branch 'master' into Mario/stats_eloranking

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

diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc
index 166c642559437d108e8a42cd50f7b225ef50ee1d..af2f4b574f43a57f0c098d19c47b5fe2754428ac 100644 (file)
--- a/qcsrc/server/scores.qc
+++ b/qcsrc/server/scores.qc
@@ -4,8 +4,7 @@
 #include "defs.qh"
 #include <server/g_world.qh>
 #include <server/miscfunctions.qh>
 #include "defs.qh"
 #include <server/g_world.qh>
 #include <server/miscfunctions.qh>

-//#include "mutators/_mod.qh"
-#include "mutators/events.qh"
+#include <server/mutators/_mod.qh>

 #include <common/net_linked.qh>
 #include "../common/playerstats.qh"
 #include "../common/teams.qh"
 #include <common/net_linked.qh>
 #include "../common/playerstats.qh"
 #include "../common/teams.qh"


@@ -403,7 +402,7 @@ float PlayerScore_Compare(entity t1, entity t2, float strict)
        });
 
        if (result.x == 0 && strict)
        });
 
        if (result.x == 0 && strict)

-               result.x = etof(t1.owner) - etof(t2.owner);
+               result.x = t1.owner.playerid - t2.owner.playerid;

 
        return result.x;
 }
 
        return result.x;
 }