X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fweaponslist.qc;h=c1189dd9ba5c702214c50c0ecea30e4613f713b7;hp=1d3b897fc055664f9ed1a3cf98765ed8ae9ad4ee;hb=193f51333a9f40b0c14bca5a309394de00fa0f9b;hpb=f2c50fe4e6218a0a1bb0ca078ee122c5ba6a238d

diff --git a/qcsrc/menu/xonotic/weaponslist.qc b/qcsrc/menu/xonotic/weaponslist.qc
index 1d3b897fc0..c1189dd9ba 100644
--- a/qcsrc/menu/xonotic/weaponslist.qc
+++ b/qcsrc/menu/xonotic/weaponslist.qc
@@ -1,15 +1,17 @@
-#ifdef INTERFACE
-CLASS(XonoticWeaponsList) EXTENDS(XonoticListBox)
-	METHOD(XonoticWeaponsList, configureXonoticWeaponsList, void(entity))
-	METHOD(XonoticWeaponsList, toString, string(entity))
+#ifndef WEAPONSLIST_H
+#define WEAPONSLIST_H
+#include "listbox.qc"
+CLASS(XonoticWeaponsList, XonoticListBox)
+	METHOD(XonoticWeaponsList, configureXonoticWeaponsList, void(entity));
+	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, resizeNotify, void(entity, vector, vector, vector, vector))
-	METHOD(XonoticWeaponsList, keyDown, float(entity, float, float, float))
+	METHOD(XonoticWeaponsList, draw, void(entity));
+	METHOD(XonoticWeaponsList, drawListBoxItem, void(entity, int, vector, bool, bool));
+	METHOD(XonoticWeaponsList, resizeNotify, void(entity, vector, vector, vector, vector));
+	METHOD(XonoticWeaponsList, keyDown, float(entity, float, float, float));
 	ATTRIB(XonoticWeaponsList, realFontSize, vector, '0 0 0')
 	ATTRIB(XonoticWeaponsList, realUpperMargin, float, 0)
-	METHOD(XonoticWeaponsList, mouseDrag, float(entity, vector))
+	METHOD(XonoticWeaponsList, mouseDrag, float(entity, vector));
 ENDCLASS(XonoticWeaponsList)
 entity makeXonoticWeaponsList();
 void WeaponsList_MoveUp_Click(entity btn, entity me);
@@ -20,7 +22,7 @@ void WeaponsList_MoveDown_Click(entity box, entity me);
 entity makeXonoticWeaponsList()
 {
 	entity me;
-	me = spawnXonoticWeaponsList();
+	me = NEW(XonoticWeaponsList);
 	me.configureXonoticWeaponsList(me);
 	return me;
 }
@@ -44,7 +46,7 @@ void WeaponsList_MoveUp_Click(entity box, entity me)
 	if(me.selectedItem > 0)
 	{
 		cvar_set("cl_weaponpriority", swapInPriorityList(cvar_string("cl_weaponpriority"), me.selectedItem - 1, me.selectedItem));
-		me.selectedItem -= 1;
+		me.setSelected(me, me.selectedItem - 1);
 	}
 }
 void WeaponsList_MoveDown_Click(entity box, entity me)
@@ -52,7 +54,7 @@ void WeaponsList_MoveDown_Click(entity box, entity me)
 	if(me.selectedItem < me.nItems - 1)
 	{
 		cvar_set("cl_weaponpriority", swapInPriorityList(cvar_string("cl_weaponpriority"), me.selectedItem, me.selectedItem + 1));
-		me.selectedItem += 1;
+		me.setSelected(me, me.selectedItem + 1);
 	}
 }
 void XonoticWeaponsList_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
@@ -65,9 +67,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
 	{
@@ -87,19 +88,24 @@ string XonoticWeaponsList_toString(entity me)
 	for(i = 0; i < n; ++i)
 	{
 		e = get_weaponinfo(stof(argv(i)));
-		s = strcat(s, e.message, ", ");
+		s = strcat(s, e.m_name, ", ");
 	}
 	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, bool isFocused)
 {
 	entity e;
 	if(isSelected)
 		draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
+	else if(isFocused)
+	{
+		me.focusedItemAlpha = getFadedAlpha(me.focusedItemAlpha, SKINALPHA_LISTBOX_FOCUSED, SKINFADEALPHA_LISTBOX_FOCUSED);
+		draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_FOCUSED, me.focusedItemAlpha);
+	}
 	e = get_weaponinfo(stof(argv(i)));
-	string msg = e.message;
+	string msg = e.m_name;
 	if(e.spawnflags & WEP_FLAG_MUTATORBLOCKED)
-		msg = sprintf(_("%s (mutator weapon)"), msg);
+		msg = strcat(msg, "*");
 
 	vector save_fontscale = draw_fontscale;
 	float f = draw_CondensedFontFactor(msg, false, me.realFontSize, 1);