Merge branch 'Mario/qc_updates' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / statslist.qc

diff --git a/qcsrc/menu/xonotic/statslist.qc b/qcsrc/menu/xonotic/statslist.qc
index d905ac3c761c3710d50997d3b0befe5f9cc0afda..99c850f13558e456d599b2ba333816748431dcba 100644 (file)
--- a/qcsrc/menu/xonotic/statslist.qc
+++ b/qcsrc/menu/xonotic/statslist.qc
@@ -1,3 +1,6 @@
+#include "../../common/counting.qh"
+#include "../../common/playerstats.qh"
+
 #ifdef INTERFACE
 CLASS(XonoticStatsList) EXTENDS(XonoticListBox)
        METHOD(XonoticStatsList, configureXonoticStatsList, void(entity))
@@ -17,7 +20,10 @@ CLASS(XonoticStatsList) EXTENDS(XonoticListBox)
        ATTRIB(XonoticStatsList, columnNameSize, float, 0)
 ENDCLASS(XonoticStatsList)
 
+#ifndef IMPLEMENTATION
+// public:
 entity statslist; // for reference elsewhere
+#endif
 entity makeXonoticStatsList();
 #endif
 
@@ -168,13 +174,13 @@ void XonoticStatsList_getStats(entity me)
 
                if((order == -1) && (out_total_matches >= 0) && (out_total_wins >= 0))
                {
-                       bufstr_add(me.listStats, sprintf("003Matches: %d", out_total_matches), TRUE);
-                       
+                       bufstr_add(me.listStats, sprintf("003Matches: %d", out_total_matches), true);
+
                        if(out_total_matches > 0) // don't show extra info if there are no matches played
                        {
                                out_total_losses = max(0, (out_total_matches - out_total_wins));
-                               bufstr_add(me.listStats, sprintf("003Wins/Losses: %d/%d", out_total_wins, out_total_losses), TRUE);
-                               bufstr_add(me.listStats, sprintf("004Win_Percentage: %d%%", ((out_total_wins / out_total_matches) * 100)), TRUE);
+                               bufstr_add(me.listStats, sprintf("003Wins/Losses: %d/%d", out_total_wins, out_total_losses), true);
+                               bufstr_add(me.listStats, sprintf("004Win_Percentage: %d%%", ((out_total_wins / out_total_matches) * 100)), true);
                        }
 
                        out_total_matches = -1;
@@ -185,13 +191,13 @@ void XonoticStatsList_getStats(entity me)
 
                if((order == -1) && (out_total_kills >= 0) && (out_total_deaths >= 0))
                {
-                       bufstr_add(me.listStats, sprintf("005Kills/Deaths: %d/%d", out_total_kills, out_total_deaths), TRUE);
+                       bufstr_add(me.listStats, sprintf("005Kills/Deaths: %d/%d", out_total_kills, out_total_deaths), true);
 
-                       // if there are no deaths, just show kill count 
+                       // if there are no deaths, just show kill count
                        if(out_total_deaths > 0)
-                               bufstr_add(me.listStats, sprintf("006Kill_Ratio: %.2f", (out_total_kills / out_total_deaths)), TRUE);
+                               bufstr_add(me.listStats, sprintf("006Kill_Ratio: %.2f", (out_total_kills / out_total_deaths)), true);
                        else
-                               bufstr_add(me.listStats, sprintf("006Kill_Ratio: %.2f", out_total_kills), TRUE);
+                               bufstr_add(me.listStats, sprintf("006Kill_Ratio: %.2f", out_total_kills), true);
 
                        out_total_kills = -1;
                        out_total_deaths = -1;
@@ -206,10 +212,10 @@ void XonoticStatsList_getStats(entity me)
                else
                {
                        float dividerpos = strstrofs(e, "/", 0);
-                       
+
                        string gametype = substring(e, 0, dividerpos);
                        if(gametype == "overall") { continue; }
-                       
+
                        string event = substring(e, (dividerpos + 1), strlen(e) - (dividerpos + 1));
 
                        // if we are ranked, read these sets of possible options
@@ -245,7 +251,7 @@ void XonoticStatsList_getStats(entity me)
                                                data = sprintf("%d%%", stof(data));
                                                break;
                                        }
-                                       
+
                                        #if 0
                                        case "favorite-map":
                                        {
@@ -255,7 +261,7 @@ void XonoticStatsList_getStats(entity me)
                                                break;
                                        }
                                        #endif
-                                       
+
                                        default: continue; // nothing to see here
                                }
 
@@ -273,12 +279,12 @@ void XonoticStatsList_getStats(entity me)
                        else { continue; }
                }
 
-               bufstr_add(me.listStats, sprintf("%s%s %s", orderstr, outstr, data), TRUE);
+               bufstr_add(me.listStats, sprintf("%s%s %s", orderstr, outstr, data), true);
        }
 
        me.nItems = buf_getsize(me.listStats);
        if(me.nItems > 0)
-               buf_sort(me.listStats, 128, FALSE);
+               buf_sort(me.listStats, 128, false);
 }
 
 void XonoticStatsList_destroy(entity me)
@@ -315,7 +321,7 @@ void XonoticStatsList_drawListBoxItem(entity me, float i, vector absSize, float
        string data = bufstr_get(me.listStats, i);
        string s = car(data);
        string d = cdr(data);
-       
+
        s = substring(s, 3, strlen(s) - 3);
        s = strreplace("_", " ", s);
        s = draw_TextShortenToWidth(s, 0.5 * me.columnNameSize, 0, me.realFontSize);