* Fix automatons not being killable in sanctum map with FF disabled.

TurningWheel · Mar 18, 2018 · 18958d7 · 18958d7
1 parent 4a8053d
commit 18958d7
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/src/entity.cpp b/src/entity.cpp
@@ -6514,6 +6514,15 @@ bool Entity::checkEnemy(Entity* your)
 		return false;
 	}
 
+	if ( myStats->type == HUMAN && (yourStats->type == AUTOMATON && !strncmp(yourStats->name, "corrupted automaton", 19)) )
+	{
+		return true;
+	}
+	else if ( yourStats->type == HUMAN && (myStats->type == AUTOMATON && !strncmp(myStats->name, "corrupted automaton", 19)) )
+	{
+		return true;
+	}
+
 	// if you have a leader, check whether we are enemies instead
 	Entity* yourLeader = NULL;
 	if ( yourStats->leader_uid )
@@ -6630,6 +6639,15 @@ bool Entity::checkFriend(Entity* your)
 		return true;
 	}
 
+	if ( myStats->type == HUMAN && (yourStats->type == AUTOMATON && !strncmp(yourStats->name, "corrupted automaton", 19)) )
+	{
+		return false;
+	}
+	else if ( yourStats->type == HUMAN && (myStats->type == AUTOMATON && !strncmp(myStats->name, "corrupted automaton", 19)) )
+	{
+		return false;
+	}
+
 	// if you have a leader, check whether we are friends instead
 	Entity* yourLeader = NULL;
 	if ( yourStats->leader_uid )