mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-25 05:31:00 +00:00
- fixed: It was possible to give inventory items to the base actors of something morphed. This would cause an assertion failure when unmorphing.
SVN r3519 (trunk)
This commit is contained in:
parent
5358fd594b
commit
7642aba6ce
1 changed files with 3 additions and 0 deletions
|
@ -1322,6 +1322,9 @@ bool AInventory::TryPickupRestricted (AActor *&toucher)
|
|||
|
||||
bool AInventory::CallTryPickup (AActor *toucher, AActor **toucher_return)
|
||||
{
|
||||
// unmorphed versions of a currently morphed actor cannot pick up anything.
|
||||
if (toucher->flags & MF_UNMORPHED) return false;
|
||||
|
||||
bool res;
|
||||
if (CanPickup(toucher))
|
||||
res = TryPickup(toucher);
|
||||
|
|
Loading…
Reference in a new issue