Merge branch 'Mario/ctf_rankings' into 'master'

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

diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc
index 84afa1144736f1c278cbe47e5b0af3122a58597d..1550cd2a3a425070054ecb7e1f5b2d1fbbb6b405 100644 (file)
--- a/qcsrc/server/race.qc
+++ b/qcsrc/server/race.qc
@@ -26,31 +26,33 @@ void W_Porto_Fail(entity this, float failhard);
 
 float race_readTime(string map, float pos)
 {
-       string rr = (g_cts) ? CTS_RECORD : RACE_RECORD;
+       string rr = ((g_cts) ? CTS_RECORD : ((g_ctf) ? CTF_RECORD : RACE_RECORD));
 
        return stof(db_get(ServerProgsDB, strcat(map, rr, "time", ftos(pos))));
 }
 
 string race_readUID(string map, float pos)
 {
-       string rr = (g_cts) ? CTS_RECORD : RACE_RECORD;
+       string rr = ((g_cts) ? CTS_RECORD : ((g_ctf) ? CTF_RECORD : RACE_RECORD));
 
        return db_get(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(pos)));
 }
 
 float race_readPos(string map, float t)
 {
-       float i;
-       for (i = 1; i <= RANKINGS_CNT; ++i)
-       if (race_readTime(map, i) == 0 || race_readTime(map, i) > t)
-               return i;
+       for(int i = 1; i <= RANKINGS_CNT; ++i)
+       {
+               int mytime = race_readTime(map, i);
+               if(!mytime || mytime > t)
+                       return i;
+       }
 
        return 0; // pos is zero if unranked
 }
 
 void race_writeTime(string map, float t, string myuid)
 {
-       string rr = (g_cts) ? CTS_RECORD : RACE_RECORD;
+       string rr = ((g_cts) ? CTS_RECORD : ((g_ctf) ? CTF_RECORD : RACE_RECORD));
 
        float newpos;
        newpos = race_readPos(map, t);
@@ -87,7 +89,7 @@ void race_writeTime(string map, float t, string myuid)
 
 string race_readName(string map, float pos)
 {
-       string rr = (g_cts) ? CTS_RECORD : RACE_RECORD;
+       string rr = ((g_cts) ? CTS_RECORD : ((g_ctf) ? CTF_RECORD : RACE_RECORD));
 
        return uid2name(db_get(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(pos))));
 }
@@ -244,15 +246,13 @@ void race_SendStatus(float id, entity e)
        });
 }
 
-void race_setTime(string map, float t, string myuid, string mynetname, entity e)
+void race_setTime(string map, float t, string myuid, string mynetname, entity e, bool showmessage)
 {
        // netname only used TEMPORARILY for printing
-       float newpos, player_prevpos;
-       newpos = race_readPos(map, t);
+       int newpos = race_readPos(map, t);
 
-       float i;
-       player_prevpos = 0;
-       for(i = 1; i <= RANKINGS_CNT; ++i)
+       int player_prevpos = 0;
+       for(int i = 1; i <= RANKINGS_CNT; ++i)
        {
                if(race_readUID(map, i) == myuid)
                        player_prevpos = i;
@@ -264,7 +264,8 @@ void race_setTime(string map, float t, string myuid, string mynetname, entity e)
        {
                oldrec = race_readTime(GetMapname(), player_prevpos);
                race_SendStatus(0, e); // "fail"
-               Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_FAIL_RANKED, mynetname, player_prevpos, t, oldrec);
+               if(showmessage)
+                       Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_FAIL_RANKED, mynetname, player_prevpos, t, oldrec);
                return;
        }
        else if (!newpos)
@@ -272,7 +273,8 @@ void race_setTime(string map, float t, string myuid, string mynetname, entity e)
                // no ranking, time worse than the worst ranked
                oldrec = race_readTime(GetMapname(), RANKINGS_CNT);
                race_SendStatus(0, e); // "fail"
-               Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_FAIL_UNRANKED, mynetname, RANKINGS_CNT, t, oldrec);
+               if(showmessage)
+                       Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_FAIL_UNRANKED, mynetname, RANKINGS_CNT, t, oldrec);
                return;
        }
 
@@ -281,7 +283,8 @@ void race_setTime(string map, float t, string myuid, string mynetname, entity e)
        // if the player does not have a UID we can unfortunately not store the record, as the rankings system relies on UIDs
        if(myuid == "")
        {
-               Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_NEW_MISSING_UID, mynetname, t);
+               if(showmessage)
+                       Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_NEW_MISSING_UID, mynetname, t);
                return;
        }
 
@@ -297,7 +300,7 @@ void race_setTime(string map, float t, string myuid, string mynetname, entity e)
        // store new ranking
        race_writeTime(GetMapname(), t, myuid);
 
-       if (newpos == 1)
+       if (newpos == 1 && showmessage)
        {
                write_recordmarker(e, time - TIME_DECODE(t), TIME_DECODE(t));
                race_send_recordtime(MSG_ALL);
@@ -310,19 +313,22 @@ void race_setTime(string map, float t, string myuid, string mynetname, entity e)
 
        if(newpos == player_prevpos)
        {
-               Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_NEW_IMPROVED, mynetname, newpos, t, oldrec);
+               if(showmessage)
+                       Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_NEW_IMPROVED, mynetname, newpos, t, oldrec);
                if(newpos == 1) { race_SendStatus(3, e); } // "new server record"
                else { race_SendStatus(1, e); } // "new time"
        }
        else if(oldrec == 0)
        {
-               Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_NEW_SET, mynetname, newpos, t);
+               if(showmessage)
+                       Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_NEW_SET, mynetname, newpos, t);
                if(newpos == 1) { race_SendStatus(3, e); } // "new server record"
                else { race_SendStatus(2, e); } // "new rank"
        }
        else
        {
-               Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_NEW_BROKEN, mynetname, oldrec_holder, newpos, t, oldrec);
+               if(showmessage)
+                       Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_RACE_NEW_BROKEN, mynetname, oldrec_holder, newpos, t, oldrec);
                if(newpos == 1) { race_SendStatus(3, e); } // "new server record"
                else { race_SendStatus(2, e); } // "new rank"
        }
@@ -330,24 +336,20 @@ void race_setTime(string map, float t, string myuid, string mynetname, entity e)
 
 void race_deleteTime(string map, float pos)
 {
-       string rr;
-       if(g_cts)
-               rr = CTS_RECORD;
-       else
-               rr = RACE_RECORD;
+       string rr = ((g_cts) ? CTS_RECORD : ((g_ctf) ? CTF_RECORD : RACE_RECORD));
 
-       float i;
-       for (i = pos; i <= RANKINGS_CNT; ++i)
+       for(int i = pos; i <= RANKINGS_CNT; ++i)
        {
+               string therank = ftos(i);
                if (i == RANKINGS_CNT)
                {
-                       db_remove(ServerProgsDB, strcat(map, rr, "time", ftos(i)));
-                       db_remove(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(i)));
+                       db_remove(ServerProgsDB, strcat(map, rr, "time", therank));
+                       db_remove(ServerProgsDB, strcat(map, rr, "crypto_idfp", therank));
                }
                else
                {
-                       db_put(ServerProgsDB, strcat(map, rr, "time", ftos(i)), ftos(race_readTime(GetMapname(), i+1)));
-                       db_put(ServerProgsDB, strcat(map, rr, "crypto_idfp", ftos(i)), race_readUID(GetMapname(), i+1));
+                       db_put(ServerProgsDB, strcat(map, rr, "time", therank), ftos(race_readTime(GetMapname(), i+1)));
+                       db_put(ServerProgsDB, strcat(map, rr, "crypto_idfp", therank), race_readUID(GetMapname(), i+1));
                }
        }
 
@@ -420,7 +422,7 @@ void race_SendTime(entity e, float cp, float t, float tvalid)
                        {
                                if(cp == race_timed_checkpoint)
                                {
-                                       race_setTime(GetMapname(), t, e.crypto_idfp, e.netname, e);
+                                       race_setTime(GetMapname(), t, e.crypto_idfp, e.netname, e, true);
                                        MUTATOR_CALLHOOK(Race_FinalCheckpoint, e);
                                }
                                if(t < recordtime || recordtime == 0)