From 4f72ebe9d6636659878a7684233f96e337eb3a94 Mon Sep 17 00:00:00 2001 From: div0 Date: Wed, 3 Sep 2008 14:54:52 +0000 Subject: [PATCH] fix weapon priority defaults git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4315 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/defaultNexuiz.cfg | 2 +- data/qcsrc/server/cl_weapons.qc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg index 6e701f1dc..6839cde37 100644 --- a/data/defaultNexuiz.cfg +++ b/data/defaultNexuiz.cfg @@ -1077,7 +1077,7 @@ set g_jump_grunt 0 // Do you make a grunting noise every time you jump? Is it th 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: diff --git a/data/qcsrc/server/cl_weapons.qc b/data/qcsrc/server/cl_weapons.qc index 15d1f4053..6b68439e2 100644 --- a/data/qcsrc/server/cl_weapons.qc +++ b/data/qcsrc/server/cl_weapons.qc @@ -128,6 +128,8 @@ string W_FixWeaponOrder_AllowIncomplete(string order) string W_FixWeaponOrder_ForceComplete(string order) { + if(order == "") + order = cvar_string("cl_weaponpriority"); return W_FixWeaponOrder(order, 1); } -- 2.39.2