From b3b87165949a2d97634b425231aeb56324cc1ce7 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 18 Jun 2018 18:40:02 +1000 Subject: [PATCH] Leave the load in the weapon when throwing it --- qcsrc/server/weapons/throwing.qc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc index 462af14d8..35837af90 100644 --- a/qcsrc/server/weapons/throwing.qc +++ b/qcsrc/server/weapons/throwing.qc @@ -101,6 +101,7 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto if(doreduce && g_weapon_stay == 2) { + #if 0 // if our weapon is loaded, give its load back to the player int i = own.(weaponentity).m_weapon.m_id; if(own.(weaponentity).(weapon_load[i]) > 0) @@ -108,10 +109,12 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto GiveResource(own, ammotype, own.(weaponentity).(weapon_load[i])); own.(weaponentity).(weapon_load[i]) = -1; // schedule the weapon for reloading } + #endif SetResourceAmount(wep, ammotype, 0); } else if(doreduce) { + #if 0 // if our weapon is loaded, give its load back to the player int i = own.(weaponentity).m_weapon.m_id; if(own.(weaponentity).(weapon_load[i]) > 0) @@ -119,7 +122,7 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto GiveResource(own, ammotype, own.(weaponentity).(weapon_load[i])); own.(weaponentity).(weapon_load[i]) = -1; // schedule the weapon for reloading } - + #endif float ownderammo = GetResourceAmount(own, ammotype); thisammo = min(ownderammo, GetResourceAmount(wep, ammotype)); SetResourceAmount(wep, ammotype, thisammo); -- 2.39.2