View difference between Paste ID: DXpbDKnR and dZDyfp2V
SHOW: | | - or go back to the newest paste.
1-
--- cl_input.c.txt	2014-05-03 20:43:28 -0400
1+
--- cl_input.c.official	2014-05-03 20:43:28 -0400
2
+++ cl_input.c	2014-05-03 20:47:06 -0400
3
@@ -33,6 +33,7 @@ cvar_t	cl_c2spps = {"cl_c2spps","0"};
4
 cvar_t	cl_c2sImpulseBackup = {"cl_c2sImpulseBackup","3"};
5
 cvar_t  cl_weaponhide = {"cl_weaponhide", "0"};
6
 cvar_t  cl_weaponpreselect = {"cl_weaponpreselect", "0"};
7
+cvar_t  cl_weaponforgetorder = {"cl_weaponforgetorder", "0"};
8
 cvar_t	cl_weaponhide_axe = {"cl_weaponhide_axe", "0"};
9
 
10
 cvar_t	cl_smartjump = {"cl_smartjump", "1"};
11
@@ -433,6 +434,9 @@ static int IN_BestWeapon_Common(int impl
12
 		}
13
 	}
14
 
15-
+	// If weapon order should not persist, set the order to the latest selected weapon
15+
+	// If weapon order should not persist, set the first element of the order to the most recent selected weapon
16
+	if (cl_weaponforgetorder.value)
17
+		weapon_order[0] = best;
18
 	return best;
19
 }
20
 
21
@@ -1100,6 +1104,7 @@ void CL_InitInput (void)
22
 	Cvar_Register (&cl_smartjump);
23
 	Cvar_Register (&cl_weaponhide);
24
 	Cvar_Register (&cl_weaponpreselect);
25
+	Cvar_Register (&cl_weaponforgetorder);
26
 	Cvar_Register (&cl_weaponhide_axe);
27
 
28
 	Cvar_Register (&cl_upspeed);