From 0cb8fd746208caaee717911a5a3124bf002fcbfe Mon Sep 17 00:00:00 2001
From: David Brown <davidpwbrown@gmail.com>
Date: Mon, 23 Dec 2019 23:54:45 +0000
Subject: [PATCH] fix NPC forgetting the yare your followers

---
 src/npctalk_funcs.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/npctalk_funcs.cpp b/src/npctalk_funcs.cpp
index 98c558ab77600..a4a48b01995d6 100644
--- a/src/npctalk_funcs.cpp
+++ b/src/npctalk_funcs.cpp
@@ -372,7 +372,7 @@ void talk_function::assign_camp( npc &p )
 
 void talk_function::stop_guard( npc &p )
 {
-    if( p.mission != NPC_MISSION_GUARD_ALLY && p.mission != NPC_MISSION_ASSIGNED_CAMP ) {
+    if( !p.is_player_ally() ) {
         p.set_attitude( NPCATT_NULL );
         p.set_mission( NPC_MISSION_NULL );
         return;
@@ -766,6 +766,7 @@ void talk_function::leave( npc &p )
     if( new_solo_fac ) {
         new_solo_fac->known_by_u = true;
     }
+    p.chatbin.first_topic = "TALK_STRANGER_NEUTRAL";
     p.set_attitude( NPCATT_NULL );
 }