Merge pull request #38632 from jkraybill/34789

Don't reset incomplete missions after skills training
CleverRaven · Mar 9, 2020 · edfbefc · edfbefc
2 parents ce7db7b + 57505d2
commit edfbefc
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/npctalk_funcs.cpp b/src/npctalk_funcs.cpp
@@ -900,7 +900,8 @@ void talk_function::start_training( npc &p )
     }
 
     mission *miss = p.chatbin.mission_selected;
-    if( miss != nullptr && miss->get_assigned_player_id() == g->u.getID() ) {
+    if( miss != nullptr && miss->get_assigned_player_id() == g->u.getID() &&
+        miss->is_complete( g->u.getID() ) ) {
         clear_mission( p );
     } else if( !npc_trading::pay_npc( p, cost ) ) {
         return;