X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fweaponslist.qc;h=18e5ffb592a98c60be2bf5e16efc0c6011cc331e;hb=20387ff9f8cef7536362de05c76cc0062416a64c;hp=1d3b897fc055664f9ed1a3cf98765ed8ae9ad4ee;hpb=bb80a6aba067167c6ef8d5f3465f03bd34142fa2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/weaponslist.qc b/qcsrc/menu/xonotic/weaponslist.qc
index 1d3b897fc..18e5ffb59 100644
--- a/qcsrc/menu/xonotic/weaponslist.qc
+++ b/qcsrc/menu/xonotic/weaponslist.qc
@@ -4,7 +4,7 @@ CLASS(XonoticWeaponsList) EXTENDS(XonoticListBox)
 	METHOD(XonoticWeaponsList, toString, string(entity))
 	ATTRIB(XonoticWeaponsList, rowsPerItem, float, 1)
 	METHOD(XonoticWeaponsList, draw, void(entity))
-	METHOD(XonoticWeaponsList, drawListBoxItem, void(entity, float, vector, float))
+	METHOD(XonoticWeaponsList, drawListBoxItem, void(entity, int, vector, bool, float))
 	METHOD(XonoticWeaponsList, resizeNotify, void(entity, vector, vector, vector, vector))
 	METHOD(XonoticWeaponsList, keyDown, float(entity, float, float, float))
 	ATTRIB(XonoticWeaponsList, realFontSize, vector, '0 0 0')
@@ -65,9 +65,8 @@ void XonoticWeaponsList_resizeNotify(entity me, vector relOrigin, vector relSize
 }
 float XonoticWeaponsList_mouseDrag(entity me, vector pos)
 {
-	float f, i;
-	i = me.selectedItem;
-	f = SUPER(XonoticWeaponsList).mouseDrag(me, pos);
+	int i = me.selectedItem;
+	float f = SUPER(XonoticWeaponsList).mouseDrag(me, pos);
 
 	if(me.pressed != 1) // don't change priority if the person is just scrolling
 	{
@@ -91,11 +90,13 @@ string XonoticWeaponsList_toString(entity me)
 	}
 	return substring(s, 0, strlen(s) - 2);
 }
-void XonoticWeaponsList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
+void XonoticWeaponsList_drawListBoxItem(entity me, int i, vector absSize, bool isSelected, float highlightedTime)
 {
 	entity e;
 	if(isSelected)
 		draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
+	else if(highlightedTime)
+		draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, getHighlightAlpha(SKINALPHA_LISTBOX_SELECTED * 0.1, highlightedTime));
 	e = get_weaponinfo(stof(argv(i)));
 	string msg = e.message;
 	if(e.spawnflags & WEP_FLAG_MUTATORBLOCKED)