nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2024-11-22 03:41:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

SERVER: Perform automatic weapon swap if weapon is empty

Browse source
This commit is contained in:
MotoLegacy 2024-01-30 15:36:25 -05:00
parent 911c1fe849
commit 2ba73023d3
1 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
source/server/weapons/weapon_core.qc
View file

@ -539,14 +539,37 @@ void () W_LoadAmmo =
} }
} }
void () CheckReload = //
// WeaponCore_CheckForReload()
// Determines if weapon should automatically
// reload after firing, or if weapon is empty
// and needs swapped out.
//
void() WeaponCore_CheckForReload =
{ {
if (!self.weapons[0].weapon_magazine_left && IsDualWeapon(self.weapon)) { // Save some array lookup time -- copy into temporary structs.
float wep_cur_mag = self.weapons[0].weapon_magazine;
float wep_cur_mag2 = self.weapons[0].weapon_magazine_left;
float wep_cur_res = self.weapons[0].weapon_reserve;
float wep_nex_mag = self.weapons[1].weapon_magazine;
float wep_nex_mag2 = self.weapons[1].weapon_magazine_left;
float wep_nex_res = self.weapons[1].weapon_reserve;
// Check if left weapon needs reloaded
if (!wep_cur_mag2 && IsDualWeapon(self.weapon)) {
W_Reload(S_LEFT); W_Reload(S_LEFT);
} }
if (!self.weapons[0].weapon_magazine && self.weapons[0].weapon_reserve) {
// Check if right weapon needs reloaded
if (!wep_cur_mag && wep_cur_res) {
W_Reload(S_RIGHT); W_Reload(S_RIGHT);
} }
// Check if a weapon swap is necessary
if (!wep_cur_mag && !wep_cur_res && !wep_cur_mag2 &&
(wep_nex_mag || wep_nex_mag2 || wep_nex_res)) {
W_PutOut();
}
} }
/* /*
@ -1085,7 +1108,7 @@ void(float side) W_Fire =
Set_W_Frame (startframe, endframe, delay, 0, FIRE, W_LoadAmmo, modelname, FALSE, side); Set_W_Frame (startframe, endframe, delay, 0, FIRE, W_LoadAmmo, modelname, FALSE, side);
self.NeedLoad = true; self.NeedLoad = true;
} else { } else {
Set_W_Frame (startframe, endframe, delay, 0, FIRE, CheckReload, modelname, FALSE, side); Set_W_Frame (startframe, endframe, delay, 0, FIRE, WeaponCore_CheckForReload, modelname, FALSE, side);
} }