From 7642aba6cebef6202a2866858f0263a8b9b69d64 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Fri, 6 Apr 2012 09:43:18 +0000
Subject: [PATCH] - 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)
---
 src/g_shared/a_pickups.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/g_shared/a_pickups.cpp b/src/g_shared/a_pickups.cpp
index f4a326dfc..acf183502 100644
--- a/src/g_shared/a_pickups.cpp
+++ b/src/g_shared/a_pickups.cpp
@@ -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);