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

diff --git a/qcsrc/menu/xonotic/weaponslist.qc b/qcsrc/menu/xonotic/weaponslist.qc
index 8a8e2205dd..18e5ffb592 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')
@@ -59,15 +59,14 @@ void XonoticWeaponsList_resizeNotify(entity me, vector relOrigin, vector relSize
 {
 	SUPER(XonoticWeaponsList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
 
-	me.realFontSize_y = me.fontSize / (absSize_y * me.itemHeight);
-	me.realFontSize_x = me.fontSize / (absSize_x * (1 - me.controlWidth));
-	me.realUpperMargin = 0.5 * (1 - me.realFontSize_y);
+	me.realFontSize_y = me.fontSize / (absSize.y * me.itemHeight);
+	me.realFontSize_x = me.fontSize / (absSize.x * (1 - me.controlWidth));
+	me.realUpperMargin = 0.5 * (1 - me.realFontSize.y);
 }
 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,21 +90,23 @@ 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)
 		msg = sprintf(_("%s (mutator weapon)"), msg);
 
 	vector save_fontscale = draw_fontscale;
-	float f = draw_CondensedFontFactor(msg, FALSE, me.realFontSize, 1);
-	draw_fontscale_x *= f;
+	float f = draw_CondensedFontFactor(msg, false, me.realFontSize, 1);
+	draw_fontscale.x *= f;
 	vector fs = me.realFontSize;
-	fs_x *= f;
+	fs.x *= f;
 	draw_Text(me.realUpperMargin * eY, msg, fs, SKINCOLOR_TEXT, SKINALPHA_TEXT, 0);
 	draw_fontscale = save_fontscale;
 }