- fixed: A_CheckProximity could return unmorphed player pawns of currently morphed players.

2016-02-10 11:58:54 +01:00 · 2016-02-10 11:58:54 +01:00 · 3e5d1feecd
parent dde9336235
commit 3e5d1feecd
1 changed files with 4 additions and 0 deletions
--- a/src/thingdef/thingdef_codeptr.cpp
+++ b/src/thingdef/thingdef_codeptr.cpp
@ -6485,6 +6485,10 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CheckProximity)
 		if (mo == ref) //Don't count self.
 			continue;

+		// no unmorphed versions of currently morphed players.
+		if (mo->flags & MF_UNMORPHED)
+			continue;
+
 		//Check inheritance for the classname. Taken partly from CheckClass DECORATE function.
 		if (flags & CPXF_ANCESTOR)
 		{