X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fplayerlist.qc;h=3fdea5ae2e513267fa9f10363bf8e08d4f5fc96f;hb=f94abbe8f67be4f1c1a824eb0545da79ba4f4133;hp=d4dc5af05df05e60fa6eaec11eaa50ff45e85365;hpb=6dc9591eba337374f2b4348a6a6deaa1cb6887d0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/playerlist.qc b/qcsrc/menu/xonotic/playerlist.qc
index d4dc5af05..3fdea5ae2 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, resizeNotify, void(entity, vector, vector, vector, vector));
+	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)
@@ -12,9 +14,10 @@ CLASS(XonoticPlayerList) EXTENDS(XonoticListBox)
 	ATTRIB(XonoticPlayerList, realUpperMargin, float, 0)
 	ATTRIB(XonoticPlayerList, origin, vector, '0 0 0')
 	ATTRIB(XonoticPlayerList, itemAbsSize, vector, '0 0 0')
-	METHOD(XonoticPlayerList, setPlayerList, void(entity, string))
-	METHOD(XonoticPlayerList, getPlayerList, string(entity, float, float))
+	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;
@@ -125,7 +128,7 @@ void XonoticPlayerList_drawListBoxItem(entity me, float i, vector absSize, float
 		if((t = strstrofs(score, ",", 0)) >= 0)
 			score = substring(score, 0, t);
 
-		if(stof(score) == -666)
+		if(stof(score) == FRAGS_SPECTATOR)
 			score = _("spectator");
 	}