fix typo

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

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index b277bb6271c1c98aa2525e5cfa9d042c885b51d3..b71eadbf38722cb17186273175c966ac4546f9fb 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -625,6 +625,7 @@ void GetCvars(float f)
        GetCvars_handleFloat(s, f, cvar_cl_forceplayermodelsfromxonotic, "cl_forceplayermodelsfromxonotic");
 #endif
        GetCvars_handleFloatOnce(s, f, cvar_cl_gunalign, "cl_gunalign");
+       GetCvars_handleFloat(s, f, cvar_cl_allow_uid2name, "cl_allow_uid2name");
 
        // fixup of switchweapon (needed for LMS or when spectating is disabled, as PutClientInServer comes too early)
        if (f > 0)
@@ -2067,10 +2068,6 @@ void print_to(entity e, string s)
 }
 
 string uid2name(string myuid) {
-       // TODO TODO TODO!
-       // store uid in separate uid2name db IF CLIENT ALLOWS THIS
-       // - make it global for all mods
-       // perhaps show 10 first digits here if missing name?
        string s;
        s = db_get(ServerProgsDB, strcat("uid2name", myuid));
        
@@ -2267,6 +2264,12 @@ string getladder()
     s = "";
     temp_s = "";
 
+    string rr;
+    if(g_cts)
+       rr = CTS_RECORD;
+    else
+       rr = RACE_RECORD;
+
     string myuid;
 
     for (k = 0; k < MapInfo_count; ++k)
@@ -2274,10 +2277,20 @@ string getladder()
         if (MapInfo_Get_ByID(k))
        {
                for (i = 0; i <= LADDER_CNT; ++i) { // i = 0 because it is the speed award
-                       if(race_readTime(GetMapname(), i) == 0)
-                           break;
+                       if(i == 0) // speed award
+                       {
+                               if(stof(db_get(ServerProgsDB, strcat(GetMapname(), rr, "speed/speed"))) == 0);
+                                       break;
 
-                       myuid = race_readUID(GetMapname(), i);
+                               myuid = db_get(ServerProgsDB, strcat(GetMapname(), rr, "speed/crypto_idfp"));
+                       }
+                       else // normal record, if it exists (else break)
+                       {
+                               if(race_readTime(GetMapname(), i) == 0)
+                                   break;
+
+                               myuid = race_readUID(GetMapname(), i);
+                       }
 
                        // string s contains:
                        // arg 0 = # of speed recs
@@ -2378,10 +2391,16 @@ string getladder()
     s = strcat(s, " ^7Speed awards ^3| ^7Name");
 
     s = strcat(s, "\n^3----+--------");
-    for (i = 1; i <= LADDER_CNT; ++i)
+    for (i = 1; i <= min(9, LADDER_CNT); ++i)
     {
        s = strcat(s, "+-----");
     }
+    if(LADDER_CNT > 9)
+           for (i = 1; i <= LADDER_CNT - 9; ++i)
+           {
+               s = strcat(s, "+------");
+           }
+
     s = strcat(s, "+--------------+--------------------\n");
 
     for (i = 0; i < LADDER_SIZE; ++i)