fix: main menu being unordered (cataclysmbnteam#2823)

* fix: menu entries being unordered

* refactor: use anonymous namespace

(followed clang-tidy)

src/action.cpp

@@ -657,21 +657,23 @@ bool can_interact_at( action_id action, const tripoint &p )
     }
 }
 
-static auto make_register_actions( std::vector<uilist_entry> &entries, const input_context &ctxt )
+namespace
 {
-    return [&]( std::set<action_id> &&names ) -> void {
+auto make_register_actions( std::vector<uilist_entry> &entries, const input_context &ctxt )
+{
+    return [&]( std::vector<action_id> &&names ) -> void {
         const auto fn = [&]( action_id name ) -> uilist_entry {
             return { name, true, hotkey_for_action( name ), ctxt.get_action_name( action_ident( name ) ) };
         };
         std::transform( names.begin(), names.end(), std::back_inserter( entries ), fn );
     };
 }
 
-static auto make_register_categories( std::vector<uilist_entry> &entries,
-                                      std::map<int, std::string> &categories_by_int,
-                                      int &last_category )
+auto make_register_categories( std::vector<uilist_entry> &entries,
+                               std::map<int, std::string> &categories_by_int,
+                               int &last_category )
 {
-    return [&]( std::set<std::string> &&names ) -> void {
+    return [&]( std::vector<std::string> &&names ) -> void {
         const auto fn = [&]( const std::string & name ) -> uilist_entry {
             categories_by_int[last_category] = name;
             return { last_category++, true, -1, name + "…" };
@@ -680,6 +682,8 @@ static auto make_register_categories( std::vector<uilist_entry> &entries,
     };
 }
 
+} // namespace
+
 action_id handle_action_menu()
 {
     const input_context ctxt = get_default_mode_input_context();