Merge branch 'master' into terencehill/menu_weaponarena_selection_fix

[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 f80e8ffa037a172988850d615b628fbaf8a03cff..db42177fbcc07380d5c702b0f1660b7d5a063c7e 100644 (file)
--- a/qcsrc/menu/xonotic/statslist.qc
+++ b/qcsrc/menu/xonotic/statslist.qc
@@ -1,17 +1,20 @@
 #include "../../common/counting.qh"
 #include "../../common/playerstats.qh"
 
-#ifdef INTERFACE
-CLASS(XonoticStatsList) EXTENDS(XonoticListBox)
-       METHOD(XonoticStatsList, configureXonoticStatsList, void(entity))
+#ifndef STATSLIST_H
+#define STATSLIST_H
+#include "listbox.qc"
+CLASS(XonoticStatsList, XonoticListBox)
+       METHOD(XonoticStatsList, configureXonoticStatsList, void(entity));
        ATTRIB(XonoticStatsList, rowsPerItem, float, 1.4)
-       METHOD(XonoticStatsList, resizeNotify, void(entity, vector, vector, vector, vector))
-       METHOD(XonoticStatsList, drawListBoxItem, void(entity, float, vector, float))
-       METHOD(XonoticStatsList, getStats, void(entity))
-       METHOD(XonoticStatsList, doubleClickListBoxItem, void(entity, float, vector))
-       METHOD(XonoticStatsList, keyDown, float(entity, float, float, float))
-       METHOD(XonoticStatsList, destroy, void(entity))
-       METHOD(XonoticStatsList, showNotify, void(entity))
+       METHOD(XonoticStatsList, resizeNotify, void(entity, vector, vector, vector, vector));
+       METHOD(XonoticStatsList, drawListBoxItem, void(entity, int, vector, bool, bool));
+       METHOD(XonoticStatsList, getStats, void(entity));
+       METHOD(XonoticStatsList, doubleClickListBoxItem, void(entity, float, vector));
+       METHOD(XonoticStatsList, keyDown, float(entity, float, float, float));
+       METHOD(XonoticStatsList, destroy, void(entity));
+       METHOD(XonoticStatsList, showNotify, void(entity));
+       ATTRIB(XonoticStatsList, selectionDoesntMatter, bool, true)
 
        ATTRIB(XonoticStatsList, listStats, float, -1)
        ATTRIB(XonoticStatsList, realFontSize, vector, '0 0 0')
@@ -32,7 +35,7 @@ entity makeXonoticStatsList();
 entity makeXonoticStatsList()
 {
        entity me;
-       me = spawnXonoticStatsList();
+       me = NEW(XonoticStatsList);
        me.configureXonoticStatsList(me);
        return me;
 }
@@ -175,7 +178,7 @@ 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);
-                       
+
                        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));
@@ -193,7 +196,7 @@ void XonoticStatsList_getStats(entity me)
                {
                        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);
                        else
@@ -212,10 +215,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
@@ -251,7 +254,7 @@ void XonoticStatsList_getStats(entity me)
                                                data = sprintf("%d%%", stof(data));
                                                break;
                                        }
-                                       
+
                                        #if 0
                                        case "favorite-map":
                                        {
@@ -261,7 +264,7 @@ void XonoticStatsList_getStats(entity me)
                                                break;
                                        }
                                        #endif
-                                       
+
                                        default: continue; // nothing to see here
                                }
 
@@ -313,15 +316,18 @@ void XonoticStatsList_resizeNotify(entity me, vector relOrigin, vector relSize,
 #endif
 }
 
-void XonoticStatsList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
+void XonoticStatsList_drawListBoxItem(entity me, int i, vector absSize, bool isSelected, bool isFocused)
 {
-       if(isSelected)
-               draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
+       if(isFocused)
+       {
+               me.focusedItemAlpha = getFadedAlpha(me.focusedItemAlpha, SKINALPHA_LISTBOX_FOCUSED, SKINFADEALPHA_LISTBOX_FOCUSED);
+               draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_FOCUSED, me.focusedItemAlpha);
+       }
 
        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);