X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fweapons.qc;h=832ffad0b38ca9b27727451808c44570e5d5eb79;hp=fef3eec09e74d7a487c48bcabe702021256cb50b;hb=8e4957c252f8381e37f2a72e227797bf51e5cc2f;hpb=4e89b0f36a79a964d87b4bfc449667466e00641d

diff --git a/qcsrc/client/hud/panel/weapons.qc b/qcsrc/client/hud/panel/weapons.qc
index fef3eec09e..832ffad0b3 100644
--- a/qcsrc/client/hud/panel/weapons.qc
+++ b/qcsrc/client/hud/panel/weapons.qc
@@ -91,11 +91,15 @@ void HUD_Weapons()
 	HUD_Panel_LoadCvars();
 
 	// figure out weapon order (how the weapons are sorted) // TODO make this configurable
-	if(weaponorder_bypriority != autocvar_cl_weaponpriority || !weaponorder[0])
+	if(weaponorder_bypriority != autocvar_cl_weaponpriority || autocvar_hud_panel_weapons_orderbyimpulse != weapons_orderbyimpulse || !weaponorder[0])
 	{
 		int weapon_cnt;
+		weapons_orderbyimpulse = autocvar_hud_panel_weapons_orderbyimpulse;
 		strcpy(weaponorder_bypriority, autocvar_cl_weaponpriority);
-		strcpy(weaponorder_byimpulse, W_FixWeaponOrder_BuildImpulseList(W_FixWeaponOrder_ForceComplete(W_NumberWeaponOrder(weaponorder_bypriority))));
+		string weporder = W_FixWeaponOrder_ForceComplete(W_NumberWeaponOrder(weaponorder_bypriority));
+		if(autocvar_hud_panel_weapons_orderbyimpulse)
+			weporder = W_FixWeaponOrder_BuildImpulseList(weporder);
+		strcpy(weaponorder_byimpulse, weporder);
 		weaponorder_cmp_str = strcat(" ", weaponorder_byimpulse, " ");
 
 		weapon_cnt = 0;