Merge branch 'master' into terencehill/string_prefixes_cleanup

[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 a3290e1e1b363bdd5305c442e6c96db4e8556dbc..aa8efd6d69a15934416371d6066b76c419bfc212 100644 (file)
--- a/qcsrc/server/command/getreplies.qc
+++ b/qcsrc/server/command/getreplies.qc
@@ -1,9 +1,8 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-       #include "../../dpdefs/progsdefs.qc"
-    #include "../../dpdefs/dpextensions.qc"
-    #include "../sys-post.qh"
+       #include "../../dpdefs/progsdefs.qh"
+    #include "../../dpdefs/dpextensions.qh"
     #include "../../common/constants.qh"
     #include "../../common/util.qh"
     #include "../../common/counting.qh"
@@ -126,7 +125,7 @@ string getrankings()
 
 string getladder()
 {
-       float i, j, k, uidcnt = 0, thiscnt;
+       int i, j, k, uidcnt = 0, thiscnt;
        string s, temp_s, rr, myuid, thisuid;
 
        rr = (g_cts) ? CTS_RECORD : RACE_RECORD;
@@ -302,7 +301,7 @@ string getladder()
 string getmaplist()
 {
        string maplist = "", col;
-       float i, argc;
+       int i, argc;
 
        argc = tokenize_console(autocvar_g_maplist);
        for(i = 0; i < argc; ++i)
@@ -357,9 +356,8 @@ string getlsmaps()
 string getmonsterlist()
 {
        string monsterlist = "", col;
-       float i;
 
-       for(i = MON_FIRST; i <= MON_LAST; ++i)
+       for(int i = MON_FIRST; i <= MON_LAST; ++i)
        {
                if(i % 2) { col = "^2"; }
                else { col = "^3"; }