From 18d14e611598decc3225e4ac8bf4fe7ee61d5ba4 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Mon, 6 Sep 2010 02:40:07 +0300 Subject: [PATCH] Fix the weapon stay bug --- Todo & known bugs.txt | 2 -- data/qcsrc/server/t_items.qc | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Todo & known bugs.txt b/Todo & known bugs.txt index bee3ce88..e2dde479 100644 --- a/Todo & known bugs.txt +++ b/Todo & known bugs.txt @@ -8,8 +8,6 @@ Todo: Known bugs: -- Weapon stay mutator: When picking up a weapon, it gets picked up infinitely until your ammo is full, rather than only once - - Prey bots don't kick in the stomach in Arena and Clan Arena gametypes - If you go spectating with someone in your belly, they are released at the spawnpoint you are teleported to once you become an observer \ No newline at end of file diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc index 18c74be3..db0e5a62 100644 --- a/data/qcsrc/server/t_items.qc +++ b/data/qcsrc/server/t_items.qc @@ -814,6 +814,13 @@ void weapon_defaultspawnfunc(float wpn) if(self.team) self.flags |= FL_NO_WEAPON_STAY; + if(g_weapon_stay == 2 && self.classname != "droppedweapon") + { + self.ammo_fuel = 0; + // weapon stay 2: don't use ammo on weapon pickups; instead + // initialize all ammo types to the pickup ammo unless set by g_start_ammo_* + } + StartItem(e.model, "weapons/weaponpickup.wav", self.respawntime, self.respawntimejitter, e.message, 0, e.weapons, FL_WEAPON, weapon_pickupevalfunc, e.bot_pickupbasevalue); if (self.modelindex) // don't precache if self was removed weapon_action(e.weapon, WR_PRECACHE); -- 2.39.2