From d4c50b1662706b252ecbdceb95cf61a1d528d7f8 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sat, 25 Oct 2014 14:59:30 +0200
Subject: [PATCH] - fixed: AActor::IsTeammate must consider monsters friendly
 to a specific player as members of the same team as the owning player. Such
 monsters cannot be made members of a designated team, though, because their
 association needs to change if the player changes teams.

---
 src/actor.h     |  3 +++
 src/p_enemy.cpp |  2 +-
 src/p_mobj.cpp  | 35 +++++++++++++++++++++++++++--------
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/actor.h b/src/actor.h
index f4d1604e5..f1c733ab2 100644
--- a/src/actor.h
+++ b/src/actor.h
@@ -716,6 +716,9 @@ public:
 	// Transforms the actor into a finely-ground paste
 	virtual bool Grind(bool items);
 
+	// Get this actor's team
+	int GetTeam();
+
 	// Is the other actor on my team?
 	bool IsTeammate (AActor *other);
 
diff --git a/src/p_enemy.cpp b/src/p_enemy.cpp
index 20b61200f..e51d601f3 100644
--- a/src/p_enemy.cpp
+++ b/src/p_enemy.cpp
@@ -1592,7 +1592,7 @@ bool P_LookForPlayers (AActor *actor, INTBOOL allaround, FLookExParams *params)
 		}
 #endif
 		// [SP] If you don't see any enemies in deathmatch, look for players (but only when friend to a specific player.)
-		if (actor->FriendPlayer == 0 && (!teamplay || actor->DesignatedTeam == TEAM_NONE)) return result;
+		if (actor->FriendPlayer == 0 && (!teamplay || actor->GetTeam() == TEAM_NONE)) return result;
 		if (result || !deathmatch) return true;
 
 
diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp
index 2b0782b8f..16d83943f 100644
--- a/src/p_mobj.cpp
+++ b/src/p_mobj.cpp
@@ -5855,22 +5855,41 @@ AActor *P_SpawnPlayerMissile (AActor *source, fixed_t x, fixed_t y, fixed_t z,
 	return NULL;
 }
 
+int AActor::GetTeam()
+{
+	if (player)
+	{
+		return player->userinfo.GetTeam();
+	}
+
+	int myTeam = DesignatedTeam;
+
+	// Check for monsters that belong to a player on the team but aren't part of the team themselves.
+	if (myTeam == TEAM_NONE && FriendPlayer != 0)
+	{
+		myTeam = players[FriendPlayer - 1].userinfo.GetTeam();
+	}
+	return myTeam;
+
+}
+
 bool AActor::IsTeammate (AActor *other)
 {
 	if (!other)
+	{
 		return false;
+	}
 	else if (!deathmatch && player && other->player)
-		return true;
-	int myTeam = DesignatedTeam;
-	int otherTeam = other->DesignatedTeam;
-	if (player)
-		myTeam = player->userinfo.GetTeam();
-	if (other->player)
-		otherTeam = other->player->userinfo.GetTeam();
-	if (teamplay && myTeam != TEAM_NONE && myTeam == otherTeam)
 	{
 		return true;
 	}
+	else if (teamplay)
+	{
+		int myTeam = GetTeam();
+		int otherTeam = other->GetTeam();
+
+		return (myTeam != TEAM_NONE && myTeam == otherTeam);
+	}
 	return false;
 }