Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added check that weapon has ammo in reload_weapon_hotkey. #391

Merged
merged 1 commit into from
Jan 25, 2022
Merged

Added check that weapon has ammo in reload_weapon_hotkey. #391

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/GameSrc/weapons.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1444,6 +1444,12 @@ uchar reload_weapon_hotkey(ushort key, uint32_t context, intptr_t data) {
int num_types;
int i, cur;

// Don't attempt to reload a weapon that doesn't use ammo!
if ((ws->type == GUN_SUBCLASS_BEAM) ||
(ws->type == GUN_SUBCLASS_HANDTOHAND)) {
return FALSE; // nice try
}

if (!differ) {
// attempts to reload the current weapon with the same ammo type it
// held before, but if that fails will reload with anything available.
Expand Down