Keyhunt: fix #2344 "KeyHunt: Unfair scoring when key is destroyed when playing with...

Fixed by saving total player score internally as a float, distributing the score to players truly evenly,
by using the new version of DistributeEvenly_Get that doesn't round the score
and updating the actual score to the rounded value of the exact score.

The version of DistributeEvenly_Get that rounds is now called DistributeEvenly_GetRounded (currently unused)

Also clean up DistributeEvenly_Init and DistributeEvenly_GetRandomized code (no logic changes)

diff --git a/qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc b/qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc
index b764c588f1e0c927ba9aae414a65842a59f15565..922418b40a0e7434cc7b2a4757e323681f310624 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc
+++ b/qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc
@@ -175,6 +175,7 @@ void kh_Controller_Think(entity this)  // called a lot
 
 // frags f: take from cvar * f
 // frags 0: no frags
+.float float_score;
 void kh_Scores_Event(entity player, entity key, string what, float frags_player, float frags_owner)  // update the score when a key is captured
 {
        string s;
@@ -182,10 +183,10 @@ void kh_Scores_Event(entity player, entity key, string what, float frags_player,
                return;
 
        if(frags_player)
-               GameRules_scoring_add_team(player, SCORE, frags_player);
+               GameRules_scoring_add_team_float2int(player, SCORE, frags_player, float_score, 1);
 
        if(key && key.owner && frags_owner)
-               GameRules_scoring_add_team(key.owner, SCORE, frags_owner);
+               GameRules_scoring_add_team_float2int(key.owner, SCORE, frags_owner, float_score, 1);
 
        if(!autocvar_sv_eventlog)  //output extra info to the console or text file
                return;

diff --git a/qcsrc/lib/random.qc b/qcsrc/lib/random.qc
index de78f4027b1691a204d983c19a5e9d89666188ef..02dbb563625b637a01b4039ba913401e02d70045 100644 (file)
--- a/qcsrc/lib/random.qc
+++ b/qcsrc/lib/random.qc
@@ -42,20 +42,29 @@ ERASEABLE
 void DistributeEvenly_Init(float amount, float totalweight)
 {
        if (DistributeEvenly_amount)
-       {
-               LOG_TRACE("DistributeEvenly_Init: UNFINISHED DISTRIBUTION (", ftos(DistributeEvenly_amount), " for ", ftos(DistributeEvenly_totalweight), " left!)");
-       }
-       if (totalweight == 0) DistributeEvenly_amount = 0;
-       else DistributeEvenly_amount = amount;
+               LOG_TRACE("DistributeEvenly_Init: UNFINISHED DISTRIBUTION (", ftos(DistributeEvenly_amount),
+                       " for ", ftos(DistributeEvenly_totalweight), " left!)");
+       DistributeEvenly_amount = (totalweight) ? amount : 0;
        DistributeEvenly_totalweight = totalweight;
 }
 
 ERASEABLE
 float DistributeEvenly_Get(float weight)
 {
-       float f;
-       if (weight <= 0) return 0;
-       f = floor(0.5 + DistributeEvenly_amount * weight / DistributeEvenly_totalweight);
+       if (weight <= 0)
+               return 0;
+       float f = DistributeEvenly_amount * weight / DistributeEvenly_totalweight;
+       DistributeEvenly_totalweight -= weight;
+       DistributeEvenly_amount -= f;
+       return f;
+}
+
+ERASEABLE
+float DistributeEvenly_GetRounded(float weight)
+{
+       if (weight <= 0)
+               return 0;
+       float f = floor(0.5 + DistributeEvenly_amount * weight / DistributeEvenly_totalweight);
        DistributeEvenly_totalweight -= weight;
        DistributeEvenly_amount -= f;
        return f;
@@ -64,9 +73,9 @@ float DistributeEvenly_Get(float weight)
 ERASEABLE
 float DistributeEvenly_GetRandomized(float weight)
 {
-       float f;
-       if (weight <= 0) return 0;
-       f = floor(random() + DistributeEvenly_amount * weight / DistributeEvenly_totalweight);
+       if (weight <= 0)
+               return 0;
+       float f = floor(random() + DistributeEvenly_amount * weight / DistributeEvenly_totalweight);
        DistributeEvenly_totalweight -= weight;
        DistributeEvenly_amount -= f;
        return f;