move more rankings code into race_writeTime... hopefully making stuff work

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index b2149c7aff6cd4c508b8a608bf29e15d52580040..a0d5252989007663e1a95dbea3ab8263316de098 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -2107,7 +2107,7 @@ float race_readPos(string map, float t) {
        return 0; // pos is zero if unranked
 }
 
-void race_writeTime(string map, float t, string myuid, float pos)
+void race_writeTime(string map, float t, string myuid)
 {
        string rr;
        if(g_cts)
@@ -2115,13 +2115,30 @@ void race_writeTime(string map, float t, string myuid, float pos)
        else
                rr = RACE_RECORD;
 
-       if(!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)

diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc
index faeaba930073cb9cc36bcf6f764b015369de6f9f..3786edbe5137d25c431da79d37036f9ea7b97361 100644 (file)
--- a/qcsrc/server/race.qc
+++ b/qcsrc/server/race.qc
@@ -169,20 +169,9 @@ void race_setTime(string map, float t, string myuid, string mynetname, entity e)
 
        oldrec = race_readTime(GetMapname(), newpos);
        oldrec_holder = race_readName(GetMapname(), newpos);
-
-       // move other rankings out of the way
-       if (player_prevpos) { // player improved his existing record, only have to iterate on ranks between new and old recs
-               for (i = player_prevpos; i > newpos; --i) {
-                       race_writeTime(GetMapname(), race_readTime(GetMapname(), i-1), race_readUID(GetMapname(), i-1), i);
-               }
-       } else { // player has no ranked record yet
-               for (i = RANKINGS_CNT; i > newpos; --i) {
-                       race_writeTime(GetMapname(), race_readTime(GetMapname(), i-1), race_readUID(GetMapname(), i-1), i);
-               }
-       }
        
        // store new ranking
-       race_writeTime(GetMapname(), t, myuid, 0); // 0 = autodetect pos
+       race_writeTime(GetMapname(), t, myuid);
 
        if (newpos == 1) {
                write_recordmarker(e, time - TIME_DECODE(t), TIME_DECODE(t));