r4315 - in trunk/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-09-03 10:54:52 -0400 (Wed, 03 Sep 2008)
New Revision: 4315

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/cl_weapons.qc
Log:
fix weapon priority defaults


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2008-09-03 14:51:50 UTC (rev 4314)
+++ trunk/data/defaultNexuiz.cfg	2008-09-03 14:54:52 UTC (rev 4315)
@@ -1077,7 +1077,7 @@
 
 alias allready "sv_cmd allready"
 
-seta cl_weaponpriority "9 8 7 6 5 4 3 2 1"
+seta cl_weaponpriority "9 8 11 7 6 5 4 3 2 1 10"
 // impulse 200, 210, 220:
 seta cl_weaponpriority0 "9 8 4"      // explosives    (RL Hagar Mortar)
 // impulse 201, 211, 221:

Modified: trunk/data/qcsrc/server/cl_weapons.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weapons.qc	2008-09-03 14:51:50 UTC (rev 4314)
+++ trunk/data/qcsrc/server/cl_weapons.qc	2008-09-03 14:54:52 UTC (rev 4315)
@@ -128,6 +128,8 @@
 
 string W_FixWeaponOrder_ForceComplete(string order)
 {
+	if(order == "")
+		order = cvar_string("cl_weaponpriority");
 	return W_FixWeaponOrder(order, 1);
 }