zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- added a null check to CheckWeaponChange.

This commit is contained in:
Christoph Oelckers 2021-08-12 20:28:04 +02:00
parent f9f48c4a95
commit 73f73cdf7c
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wadsrc/static/zscript/actors/player/player.zs
View File

@ -456,6 +456,7 @@ class PlayerPawn : Actor
virtual void CheckWeaponChange ()
{
let player = self.player;
if (!player) return;
if ((player.WeaponState & WF_DISABLESWITCH) || // Weapon changing has been disabled.
player.morphTics != 0) // Morphed classes cannot change weapons.
{ // ...so throw away any pending weapon requests.