nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2024-11-25 21:31:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Server: Add check for partial and full reloads in weapon_core.qc

Browse source
This commit is contained in:
Ian 2022-12-20 02:08:32 -05:00 committed by GitHub
parent 3364b19a4b
commit d5235469cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -482,6 +482,7 @@ void(float side) W_Reload =
delay = getWeaponDelay(self.weapon,RELOAD);
void(optional float t) endanimfunc = SUB_Null;
// TODO: Make browning use new reload status frames
if (self.weapon == W_BROWNING || self.weapon == W_ACCELERATOR) {
if (!self.currentmag) {
startframe = 26;
@ -502,7 +503,22 @@ void(float side) W_Reload =
reloadcancelframe = 0;
delay = 0.8;
endanimfunc = ContinueReload;
} else if (self.weapon == W_M1 || self.weapon == W_M1000) {
}
// Check for special reload type
else if (GetFrame(self.weapon, RELOAD_EMPTY_START) != 0) {
//reloadcancelframe = GetFrame(self.weapon, RELOAD_CANCEL);
if (self.currentmag > 0) {
startframe = GetFrame(self.weapon, RELOAD_PART_START);
endframe = GetFrame(self.weapon, RELOAD_PART_END);
delay = getWeaponDelay(self.weapon, RELOAD_PAR);
} else {
startframe = GetFrame(self.weapon, RELOAD_EMPTY_START);
endframe = GetFrame(self.weapon, RELOAD_EMPTY_END);
delay = getWeaponDelay(self.weapon, RELOAD_EMP);
}
endanimfunc = W_AdvanceAnim;
}
/* else if (self.weapon == W_M1 || self.weapon == W_M1000) {
if (self.currentmag > 0) {
startframe = 4;
endframe = 44;
@ -516,7 +532,7 @@ void(float side) W_Reload =
delay = 3.6;
endanimfunc = W_Give_Ammo;
}
} else if (self.weapon == W_TRENCH || self.weapon == W_GUT) {
} */else if (self.weapon == W_TRENCH || self.weapon == W_GUT) {
if (self.currentmag == 0) {
self.NeedLoad = true;
}