Merge pull request #36391 from davidpwbrown/npc_not_followers

fix NPC forgetting they are your followers
CleverRaven · Dec 24, 2019 · c956a9e · c956a9e
2 parents 1d87bc5 + 0cb8fd7
commit c956a9e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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 );
 }