zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-11 07:12:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: It was possible to give inventory items to the base actors of something morphed. This would cause an assertion failure when unmorphing.

Browse source 
SVN r3519 (trunk)
This commit is contained in:
Christoph Oelckers 2012-04-06 09:43:18 +00:00
parent 5358fd594b
commit 7642aba6ce
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/g_shared/a_pickups.cpp
View file

@ -1322,6 +1322,9 @@ bool AInventory::TryPickupRestricted (AActor *&toucher)
bool AInventory::CallTryPickup (AActor *toucher, AActor **toucher_return) 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; bool res;
if (CanPickup(toucher)) if (CanPickup(toucher))
res = TryPickup(toucher); res = TryPickup(toucher);