Listbox / Picker: Implement item fading in a different way so that it gets influenced...

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

diff --git a/qcsrc/menu/xonotic/charmap.qc b/qcsrc/menu/xonotic/charmap.qc
index eb83ff846de56c4b241f706f0dfbd1c02fbede8d..68c0e566fa449bd43030e437750b282280cdf671 100644 (file)
--- a/qcsrc/menu/xonotic/charmap.qc
+++ b/qcsrc/menu/xonotic/charmap.qc
@@ -10,9 +10,9 @@ CLASS(XonoticCharmap) EXTENDS(XonoticPicker)
        ATTRIB(XonoticCharmap, rows, float, 10)
        ATTRIB(XonoticCharmap, columns, float, 14)
 
-       METHOD(XonoticCharmap, cellSelect, void(entity))
+       METHOD(XonoticCharmap, cellSelect, void(entity, vector))
        METHOD(XonoticCharmap, cellIsValid, bool(entity, vector))
-       METHOD(XonoticCharmap, cellDraw, void(entity, vector, vector, float))
+       METHOD(XonoticCharmap, cellDraw, void(entity, vector, vector))
        METHOD(XonoticCharmap, charOffset, vector)
 ENDCLASS(XonoticCharmap)
 entity makeXonoticCharmap(entity controlledInputBox);
@@ -92,9 +92,9 @@ float XonoticCharmap_keyDown(entity me, float key, float ascii, float shift)
        return me.inputBox.keyDown(me.inputBox, key, ascii, shift);
 }
 
-void XonoticCharmap_cellSelect(entity me)
+void XonoticCharmap_cellSelect(entity me, vector cell)
 {
-       string character = charmap_cellToChar(me, me.focusedCell);
+       string character = charmap_cellToChar(me, cell);
        if(character != "")
                me.inputBox.enterText(me.inputBox, character);
 }
@@ -106,7 +106,7 @@ bool XonoticCharmap_cellIsValid(entity me, vector cell)
        return true;
 }
 
-void XonoticCharmap_cellDraw(entity me, vector cell, vector cellPos, float highlightedTime)
+void XonoticCharmap_cellDraw(entity me, vector cell, vector cellPos)
 {
        draw_CenterText(cellPos + me.charOffset, charmap_cellToChar(me, cell), me.realFontSize, SKINCOLOR_CHARMAP_CHAR, SKINALPHA_CHARMAP_CHAR, 0);
 }