X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fplayerlist.qc;h=72fe69e116ee4402a875bb6abf47fb5fae470877;hp=d4dc5af05df05e60fa6eaec11eaa50ff45e85365;hb=99c1b6ca80a69e112d410ee493d62f757b2c6df8;hpb=bb80a6aba067167c6ef8d5f3465f03bd34142fa2 diff --git a/qcsrc/menu/xonotic/playerlist.qc b/qcsrc/menu/xonotic/playerlist.qc index d4dc5af05d..72fe69e116 100644 --- a/qcsrc/menu/xonotic/playerlist.qc +++ b/qcsrc/menu/xonotic/playerlist.qc @@ -1,8 +1,10 @@ -#ifdef INTERFACE -CLASS(XonoticPlayerList) EXTENDS(XonoticListBox) +#ifndef PLAYERLIST_H +#define PLAYERLIST_H +#include "listbox.qc" +CLASS(XonoticPlayerList, XonoticListBox) ATTRIB(XonoticPlayerList, rowsPerItem, float, 1) METHOD(XonoticPlayerList, resizeNotify, void(entity, vector, vector, vector, vector)) - METHOD(XonoticPlayerList, drawListBoxItem, void(entity, float, vector, float)) + METHOD(XonoticPlayerList, drawListBoxItem, void(entity, int, vector, bool, bool)) ATTRIB(XonoticPlayerList, allowFocusSound, float, 0) ATTRIB(XonoticPlayerList, realFontSize, vector, '0 0 0') ATTRIB(XonoticPlayerList, columnNameOrigin, float, 0) @@ -15,6 +17,7 @@ CLASS(XonoticPlayerList) EXTENDS(XonoticListBox) METHOD(XonoticPlayerList, setPlayerList, void(entity, string)) METHOD(XonoticPlayerList, getPlayerList, string(entity, float, float)) ATTRIB(XonoticPlayerList, playerList, float, -1) + ATTRIB(XonoticPlayerList, selectionDoesntMatter, bool, true) ENDCLASS(XonoticPlayerList) entity makeXonoticPlayerList(); #endif @@ -30,7 +33,7 @@ const float PLAYERPARM_COUNT = 4; entity makeXonoticPlayerList() { entity me; - me = spawnXonoticPlayerList(); + me = NEW(XonoticPlayerList); me.configureXonoticListBox(me); return me; } @@ -92,7 +95,7 @@ void XonoticPlayerList_resizeNotify(entity me, vector relOrigin, vector relSize, me.columnScoreOrigin = me.columnNameOrigin + me.columnNameSize + me.realFontSize.x; } -void XonoticPlayerList_drawListBoxItem(entity me, float i, vector absSize, float isSelected) +void XonoticPlayerList_drawListBoxItem(entity me, int i, vector absSize, bool isSelected, bool isFocused) { string s; string score;