Merge remote branch 'refs/remotes/origin/fruitiex/racefixes'

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

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index b71eadbf38722cb17186273175c966ac4546f9fb..a20c31dd63e18ee5d133bf46dc62b970b1414e8d 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -578,9 +578,19 @@ void GetCvars_handleFloatOnce(string thisname, float f, .float field, string nam
                        stuffcmd(self, strcat("cl_cmd sendcvar ", name, "\n"));
        }
 }
-string W_FixWeaponOrder_ForceComplete(string s);
-string W_FixWeaponOrder_AllowIncomplete(string s);
 float w_getbestweapon(entity e);
+string W_FixWeaponOrder_ForceComplete_AndBuildImpulseList(string wo)
+{
+       string o;
+       o = W_FixWeaponOrder_ForceComplete(wo);
+       if(self.weaponorder_byimpulse)
+       {
+               strunzone(self.weaponorder_byimpulse);
+               self.weaponorder_byimpulse = string_null;
+       }
+       self.weaponorder_byimpulse = strzone(W_FixWeaponOrder_BuildImpulseList(o));
+       return o;
+}
 void GetCvars(float f)
 {
        string s;
@@ -597,7 +607,7 @@ void GetCvars(float f)
        GetCvars_handleFloat(s, f, cvar_cl_shownames, "cl_shownames");
        GetCvars_handleString(s, f, cvar_g_xonoticversion, "g_xonoticversion");
        GetCvars_handleFloat(s, f, cvar_cl_handicap, "cl_handicap");
-       GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriority, "cl_weaponpriority", W_FixWeaponOrder_ForceComplete);
+       GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriority, "cl_weaponpriority", W_FixWeaponOrder_ForceComplete_AndBuildImpulseList);
        GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[0], "cl_weaponpriority0", W_FixWeaponOrder_AllowIncomplete);
        GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[1], "cl_weaponpriority1", W_FixWeaponOrder_AllowIncomplete);
        GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[2], "cl_weaponpriority2", W_FixWeaponOrder_AllowIncomplete);
@@ -1720,7 +1730,6 @@ void precache()
 #define INITPRIO_FIRST              0
 #define INITPRIO_GAMETYPE           0
 #define INITPRIO_GAMETYPE_FALLBACK  1
-#define INITPRIO_CVARS              5
 #define INITPRIO_FINDTARGET        10
 #define INITPRIO_DROPTOFLOOR       20
 #define INITPRIO_SETLOCATION       90
@@ -2115,13 +2124,30 @@ void race_writeTime(string map, float t, string myuid)
        else
                rr = RACE_RECORD;
 
-       float pos;
-       pos = race_readPos(map, t);
+       float newpos;
+       newpos = race_readPos(map, t);
 
-       if(pos) { // don't even ALLOW writing unranked times into the db, less stuff to worry about in other code then :-)
-               db_put(ServerProgsDB, strcat(map, rr, "time", ftos(pos)), ftos(t));
-               db_put(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(pos)), myuid);
+       float i, prevpos;
+       for(i = 1; i <= RANKINGS_CNT; ++i)
+       {
+               if(race_readUID(map, i) == myuid)
+                       prevpos = i;
        }
+       if (prevpos) { // player improved his existing record, only have to iterate on ranks between new and old recs
+               for (i = prevpos; i > newpos; --i) {
+                       db_put(ServerProgsDB, strcat(map, rr, "time", ftos(i)), ftos(race_readTime(map, i - 1)));
+                       db_put(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(i)), race_readUID(map, i - 1));
+               }
+       } else { // player has no ranked record yet
+               for (i = RANKINGS_CNT; i > newpos; --i) {
+                       db_put(ServerProgsDB, strcat(map, rr, "time", ftos(i)), ftos(race_readTime(map, i - 1)));
+                       db_put(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(i)), race_readUID(map, i - 1));
+               }
+       }
+
+       // store new time itself
+       db_put(ServerProgsDB, strcat(map, rr, "time", ftos(newpos)), ftos(t));
+       db_put(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(newpos)), myuid);
 }
 
 string race_readName(string map, float pos)
@@ -2255,10 +2281,9 @@ const float LADDER_CNT = 10; // position X still gives LADDER_FIRSTPOINT/X point
 const float LADDER_SIZE = 30; // ladder shows the top X players
 string top_uids[LADDER_SIZE];
 float top_scores[LADDER_SIZE];
-float UIDCNT;
 string getladder()
 {
-    float i, j, k;
+    float i, j, k, uidcnt;
     string s, temp_s;
 
     s = "";
@@ -2279,17 +2304,17 @@ string getladder()
                for (i = 0; i <= LADDER_CNT; ++i) { // i = 0 because it is the speed award
                        if(i == 0) // speed award
                        {
-                               if(stof(db_get(ServerProgsDB, strcat(GetMapname(), rr, "speed/speed"))) == 0);
-                                       break;
+                               if(stof(db_get(ServerProgsDB, strcat(MapInfo_Map_bspname, rr, "speed/speed"))) == 0)
+                                       continue;
 
-                               myuid = db_get(ServerProgsDB, strcat(GetMapname(), rr, "speed/crypto_idfp"));
+                               myuid = db_get(ServerProgsDB, strcat(MapInfo_Map_bspname, rr, "speed/crypto_idfp"));
                        }
                        else // normal record, if it exists (else break)
                        {
-                               if(race_readTime(GetMapname(), i) == 0)
-                                   break;
+                               if(race_readTime(MapInfo_Map_bspname, i) == 0)
+                                       continue;
 
-                               myuid = race_readUID(GetMapname(), i);
+                               myuid = race_readUID(MapInfo_Map_bspname, i);
                        }
 
                        // string s contains:
@@ -2302,8 +2327,8 @@ string getladder()
                        temp_s = db_get(TemporaryDB, strcat("ladder", myuid));
                        if (temp_s == "")
                        {
-                           db_put(TemporaryDB, strcat("uid", ftos(UIDCNT)), myuid);
-                           ++UIDCNT;
+                           db_put(TemporaryDB, strcat("uid", ftos(uidcnt)), myuid);
+                           ++uidcnt;
                            for (j = 0; j <= LADDER_CNT + 1; ++j)
                            {
                                if(j != LADDER_CNT + 1)
@@ -2356,7 +2381,7 @@ string getladder()
 
     float thiscnt;
     string thisuid;
-    for (i = 0; i <= UIDCNT; ++i) // for each known uid
+    for (i = 0; i <= uidcnt; ++i) // for each known uid
     {
        thisuid = db_get(TemporaryDB, strcat("uid", ftos(i)));
        temp_s = db_get(TemporaryDB, strcat("ladder", thisuid));
@@ -2411,10 +2436,16 @@ string getladder()
            continue;
        s = strcat(s, strpad(4, race_placeName(i+1)), "^3| ^7"); // pos
        s = strcat(s, strpad(7, argv(LADDER_CNT+1)), "^3| ^7"); // total
-       for (j = 1; j <= LADDER_CNT; ++j)
+       for (j = 1; j <= min(9, LADDER_CNT); ++j)
        {
            s = strcat(s, strpad(4, argv(j)), "^3| ^7"); // 1st, 2nd, 3rd etc cnt
        }
+       if(LADDER_CNT > 9)
+               for (j = 10; j <= LADDER_CNT; ++j)
+               {
+                   s = strcat(s, strpad(4, argv(j)), " ^3| ^7"); // 1st, 2nd, 3rd etc cnt
+               }
+
        s = strcat(s, strpad(13, argv(0)), "^3| ^7"); // speed award cnt
        s = strcat(s, uid2name(top_uids[i]), "\n"); // name
     }