From 7f7b06ab5df07e654b4af0cf3a2860a57b3d3f1f Mon Sep 17 00:00:00 2001 From: Samual Date: Tue, 17 Apr 2012 13:05:51 -0400 Subject: [PATCH] Fix weapons in warmup/clan arena/last man standing --- qcsrc/server/miscfunctions.qc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index ad5893455..3686568d8 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -785,13 +785,19 @@ float want_weapon(string cvarprefix, entity weaponinfo, float allguns) return 0; if (g_lms || g_ca || allguns) - d = (weaponinfo.spawnflags & WEP_FLAG_NORMAL); + { + if(weaponinfo.spawnflags & WEP_FLAG_NORMAL) + d = TRUE; + else + d = FALSE; + } else if (g_cts) d = (i == WEP_SHOTGUN); else if (g_nexball) d = 0; // weapon is set a few lines later else d = (i == WEP_LASER || i == WEP_SHOTGUN); + if(g_grappling_hook) // if possible, redirect off-hand hook to on-hand hook d |= (i == WEP_HOOK); if(weaponinfo.spawnflags & WEP_FLAG_MUTATORBLOCKED) // never default mutator blocked guns @@ -799,6 +805,8 @@ float want_weapon(string cvarprefix, entity weaponinfo, float allguns) var float t = cvar(strcat(cvarprefix, weaponinfo.netname)); + //print(strcat("want_weapon: ", weaponinfo.netname, " - d: ", ftos(d), ", t: ", ftos(t), ". \n")); + // bit order in t: // 1: want or not // 2: is default? -- 2.39.2