Merge branch 'master' into terencehill/forced_intermission_eventchase

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

diff --git a/qcsrc/server/command/getreplies.qc b/qcsrc/server/command/getreplies.qc
index 29b707b93da4bf08de5116d1ece08abda4956bc6..0bedd6d5e21f3ce44f0b2d479eed092a59029b65 100644 (file)
--- a/qcsrc/server/command/getreplies.qc
+++ b/qcsrc/server/command/getreplies.qc
@@ -12,8 +12,10 @@
        
 string getrecords(float page) // 50 records per page
 {      
-       float rec, r, i;
+       float rec = 0, r, i;
        string h, s;
+       
+       s = "";
 
        if (g_ctf)
        {
@@ -23,7 +25,7 @@ string getrecords(float page) // 50 records per page
                        {
                                r = stof(db_get(ServerProgsDB, strcat(MapInfo_Map_bspname, "/captimerecord/time")));
                                
-                               if (r == 0)
+                               if not(r)
                                        continue;
                                        
                                // TODO: uid2name
@@ -42,7 +44,7 @@ string getrecords(float page) // 50 records per page
                        {
                                r = race_readTime(MapInfo_Map_bspname, 1);
                                
-                               if (r == 0)
+                               if not(r)
                                        continue;
                                        
                                h = race_readName(MapInfo_Map_bspname, 1);
@@ -60,7 +62,7 @@ string getrecords(float page) // 50 records per page
                        {
                                r = race_readTime(MapInfo_Map_bspname, 1);
                                
-                               if (r == 0)
+                               if not(r)
                                        continue;
                                        
                                h = race_readName(MapInfo_Map_bspname, 1);
@@ -72,7 +74,7 @@ string getrecords(float page) // 50 records per page
 
        MapInfo_ClearTemps();
 
-       if (s == "" && page == 0)
+       if(s == "" && page == 0)
                return "No records are available on this server.\n";
        else
                return s;
@@ -85,6 +87,7 @@ string getrankings()
 
        map = GetMapname();
 
+       s = "";
        for (i = 1; i <= RANKINGS_CNT; ++i)
        {
                t = race_readTime(map, i);
@@ -107,7 +110,7 @@ string getrankings()
 
 string getladder()
 {
-       float i, j, k, uidcnt, thiscnt;
+       float i, j, k, uidcnt = 0, thiscnt;
        string s, temp_s, rr, myuid, thisuid;
        
        if(g_cts)
@@ -281,4 +284,4 @@ string getladder()
                return "No ladder on this server!\n";
        else
                return strcat("Top ", ftos(LADDER_SIZE), " ladder rankings:\n", s);
-}
\ No newline at end of file
+}