X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fweaponslist.c;h=6790befe122be32a5159e5732fa2615efc5d6daa;hb=bfd3892eeb1401e14fc7da982f8b33d77d91384a;hp=012f7bc7e68ea7e739e4028bbddbae5e984314f4;hpb=b49d3f3ffff847ec761e15fcc6285a736cddcba3;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/weaponslist.c b/qcsrc/menu/xonotic/weaponslist.c
index 012f7bc7e..6790befe1 100644
--- a/qcsrc/menu/xonotic/weaponslist.c
+++ b/qcsrc/menu/xonotic/weaponslist.c
@@ -10,7 +10,6 @@ CLASS(XonoticWeaponsList) EXTENDS(XonoticListBox)
 	ATTRIB(XonoticWeaponsList, realFontSize, vector, '0 0 0')
 	ATTRIB(XonoticWeaponsList, realUpperMargin, float, 0)
 	METHOD(XonoticWeaponsList, mouseDrag, float(entity, vector))
-	ATTRIB(XonoticWeaponsList, scrollbarWidth, float, 0)
 ENDCLASS(XonoticWeaponsList)
 entity makeXonoticWeaponsList();
 void WeaponsList_MoveUp_Click(entity btn, entity me);
@@ -25,23 +24,20 @@ entity makeXonoticWeaponsList()
 	me.configureXonoticWeaponsList(me);
 	return me;
 }
-void configureXonoticWeaponsListXonoticWeaponsList(entity me)
+void XonoticWeaponsList_configureXonoticWeaponsList(entity me)
 {
 	me.configureXonoticListBox(me);
 }
-void drawXonoticWeaponsList(entity me)
+void XonoticWeaponsList_draw(entity me)
 {
 	// read in cvar?
 	string s, t;
 	s = W_NumberWeaponOrder(cvar_string("cl_weaponpriority"));
 	t = W_FixWeaponOrder(s, 1);
 	if(t != s)
-	{
-		print("AUTOFIXED\n");
 		cvar_set("cl_weaponpriority", W_NameWeaponOrder(t));
-	}
 	me.nItems = tokenize_console(t);
-	drawListBox(me);
+	SUPER(XonoticWeaponsList).draw(me);
 }
 void WeaponsList_MoveUp_Click(entity box, entity me)
 {
@@ -59,24 +55,29 @@ void WeaponsList_MoveDown_Click(entity box, entity me)
 		me.selectedItem += 1;
 	}
 }
-void resizeNotifyXonoticWeaponsList(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void XonoticWeaponsList_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
-	resizeNotifyXonoticListBox(me, relOrigin, relSize, absOrigin, absSize);
+	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);
 }
-float mouseDragXonoticWeaponsList(entity me, vector pos)
+float XonoticWeaponsList_mouseDrag(entity me, vector pos)
 {
 	float f, i;
 	i = me.selectedItem;
-	f = mouseDragListBox(me, pos);
-	if(me.selectedItem != i)
-		cvar_set("cl_weaponpriority", swapInPriorityList(cvar_string("cl_weaponpriority"), me.selectedItem, i));
+	f = SUPER(XonoticWeaponsList).mouseDrag(me, pos);
+	
+	if(me.pressed != 1) // don't change priority if the person is just scrolling
+	{
+		if(me.selectedItem != i)
+			cvar_set("cl_weaponpriority", swapInPriorityList(cvar_string("cl_weaponpriority"), me.selectedItem, i));
+	}
+	
 	return f;
 }
-string toStringXonoticWeaponsList(entity me)
+string XonoticWeaponsList_toString(entity me)
 {
 	float n, i;
 	string s;
@@ -90,16 +91,19 @@ string toStringXonoticWeaponsList(entity me)
 	}
 	return substring(s, 0, strlen(s) - 2);
 }
-void drawListBoxItemXonoticWeaponsList(entity me, float i, vector absSize, float isSelected)
+void XonoticWeaponsList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
 {
 	entity e;
 	if(isSelected)
 		draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
 	e = get_weaponinfo(stof(argv(i)));
-	draw_Text(me.realUpperMargin * eY, e.message, me.realFontSize, '1 1 1', SKINALPHA_TEXT, 0);
+	string msg = e.message;
+	if(e.spawnflags & WEP_FLAG_MUTATORBLOCKED)
+		msg = sprintf(_("%s (mutator weapon)"), msg);
+	draw_Text(me.realUpperMargin * eY, msg, me.realFontSize, '1 1 1', SKINALPHA_TEXT, 0);
 }
 
-float keyDownXonoticWeaponsList(entity me, float scan, float ascii, float shift)
+float XonoticWeaponsList_keyDown(entity me, float scan, float ascii, float shift)
 {
 	if(ascii == 43) // +
 	{
@@ -111,7 +115,7 @@ float keyDownXonoticWeaponsList(entity me, float scan, float ascii, float shift)
 		WeaponsList_MoveDown_Click(NULL, me);
 		return 1;
 	}
-	else if(keyDownListBox(me, scan, ascii, shift))
+	else if(SUPER(XonoticWeaponsList).keyDown(me, scan, ascii, shift))
 		return 1;
 	return 0;
 }