Prevent selected NPC jumping to the top in training session menus (#5…

…5432)
CleverRaven · Feb 21, 2022 · 90f84f4 · 90f84f4
1 parent 552323c
commit 90f84f4
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 69 deletions.
diff --git a/src/npctalk.cpp b/src/npctalk.cpp
@@ -349,44 +349,6 @@ static int npc_select_menu( const std::vector<npc *> &npc_list, const std::strin
 
 }
 
-static std::vector<int> npcs_select_menu( const std::vector<npc *> &npc_list,
-        const std::string &prompt,
-        std::function<bool( const npc * )> exclude_func = nullptr )
-{
-    std::vector<int> picked;
-    if( npc_list.empty() ) {
-        return picked;
-    }
-    const int npc_count = npc_list.size();
-    do {
-        uilist nmenu;
-        nmenu.text = prompt;
-        for( int i = 0; i < npc_count; i++ ) {
-            std::string entry;
-            if( std::find( picked.begin(), picked.end(), i ) != picked.end() ) {
-                entry = "* ";
-            }
-            bool enable = exclude_func == nullptr || !exclude_func( npc_list[i] );
-            entry += npc_list[i]->name_and_activity();
-            nmenu.addentry( i, enable, MENU_AUTOASSIGN, entry );
-        }
-        nmenu.addentry( npc_count, true, MENU_AUTOASSIGN, _( "Finish selection" ) );
-        nmenu.query();
-        if( nmenu.ret < 0 ) {
-            return std::vector<int>();
-        } else if( nmenu.ret >= npc_count ) {
-            break;
-        }
-        std::vector<int>::iterator exists = std::find( picked.begin(), picked.end(), nmenu.ret );
-        if( exists != picked.end() ) {
-            picked.erase( exists );
-        } else {
-            picked.push_back( nmenu.ret );
-        }
-    } while( true );
-    return picked;
-}
-
 static skill_id skill_select_menu( const Character &c, const std::string &prompt )
 {
     int i = 0;
@@ -713,7 +675,7 @@ void game::chat()
             if( !sk.is_valid() ) {
                 return;
             }
-            std::vector<int> selected = npcs_select_menu( followers,
+            std::vector<int> selected = npcs_select_menu<npc>( followers,
             _( "Who should participate in the training seminar?" ), [&]( const npc * n ) {
                 return !n || n->get_knowledge_level( sk ) >= player_character.get_skill_level( sk );
             } );

diff --git a/src/npctalk.h b/src/npctalk.h
@@ -2,8 +2,8 @@
 #ifndef CATA_SRC_NPCTALK_H
 #define CATA_SRC_NPCTALK_H
 
+#include "npc.h"
 #include "type_id.h"
-#include "character.h"
 
 class item;
 class json_talk_topic;
@@ -137,4 +137,50 @@ int calc_spell_training_cost( const Character &teacher, const Character &student
 
 const json_talk_topic *get_talk_topic( const std::string &id );
 
+template<class T>
+std::vector<int> npcs_select_menu( const std::vector<T *> &npc_list,
+                                   const std::string &prompt,
+                                   std::function<bool( const T * )> exclude_func )
+{
+    std::vector<int> picked;
+    if( npc_list.empty() ) {
+        return picked;
+    }
+    const int npc_count = npc_list.size();
+    int last_index = 0;
+    do {
+        uilist nmenu;
+        nmenu.text = prompt;
+        for( int i = 0; i < npc_count; i++ ) {
+            std::string entry;
+            if( std::find( picked.begin(), picked.end(), i ) != picked.end() ) {
+                entry = "* ";
+            }
+            bool enable = exclude_func == nullptr || !exclude_func( npc_list[i] );
+            if( const npc *np = dynamic_cast<const npc *>( npc_list[i] ) ) {
+                entry += np->name_and_activity();
+            } else {
+                entry += npc_list[i]->disp_name( false, true );
+            }
+            nmenu.addentry( i, enable, MENU_AUTOASSIGN, entry );
+        }
+        nmenu.addentry( npc_count, true, MENU_AUTOASSIGN, _( "Finish selection" ) );
+        nmenu.selected = nmenu.fselected = last_index;
+        nmenu.query();
+        if( nmenu.ret < 0 ) {
+            return std::vector<int>();
+        } else if( nmenu.ret >= npc_count ) {
+            break;
+        }
+        std::vector<int>::iterator exists = std::find( picked.begin(), picked.end(), nmenu.ret );
+        if( exists != picked.end() ) {
+            picked.erase( exists );
+        } else {
+            picked.push_back( nmenu.ret );
+        }
+        last_index = nmenu.fselected;
+    } while( true );
+    return picked;
+}
+
 #endif // CATA_SRC_NPCTALK_H
diff --git a/src/npctalk_funcs.cpp b/src/npctalk_funcs.cpp
@@ -1046,7 +1046,6 @@ void talk_function::start_training_seminar( npc &p )
     }
     students.push_back( &get_player_character() );
 
-    const int s_count = students.size();
     std::vector<Character *> picked;
     std::function<bool( const Character * )> include_func = [&]( const Character * c ) {
         if( d.skill != skill_id() ) {
@@ -1062,37 +1061,18 @@ void talk_function::start_training_seminar( npc &p )
         }
         return false;
     };
-    do {
-        uilist nmenu;
-        nmenu.text = _( "Who should participate?" );
-        for( int i = 0; i < s_count; i++ ) {
-            std::string entry;
-            if( std::find( picked.begin(), picked.end(), students[i] ) != picked.end() ) {
-                entry = "* ";
-            }
-            bool enable = include_func( students[i] );
-            entry += students[i]->disp_name( false, true );
-            nmenu.addentry( i, enable, MENU_AUTOASSIGN, entry );
-        }
-        nmenu.addentry( s_count, true, MENU_AUTOASSIGN, _( "Finish selection" ) );
-        nmenu.query();
-        if( nmenu.ret < 0 ) {
-            return;
-        } else if( nmenu.ret >= s_count ) {
-            break;
-        }
-        std::vector<Character *>::iterator exists = std::find( picked.begin(), picked.end(),
-                students[nmenu.ret] );
-        if( exists != picked.end() ) {
-            picked.erase( exists );
-        } else {
-            picked.emplace_back( students[nmenu.ret] );
-        }
-    } while( true );
+    std::vector<int> selected = npcs_select_menu<Character>( students, _( "Who should participate?" ),
+    [&include_func]( const Character * ch ) {
+        return !include_func( ch );
+    } );
 
-    if( picked.empty() ) {
+    if( selected.empty() ) {
         return;
     }
+    picked.reserve( selected.size() );
+    for( int sel : selected ) {
+        picked.emplace_back( students[sel] );
+    }
     start_training_gen( p, picked, d );
 }