remove vanilla partitioning for squad members

myk002 · myk002 · commit edf9cd97cb26 · 2024-02-19T15:22:11.000-08:00
diff --git a/docs/plugins/sort.rst b/docs/plugins/sort.rst
@@ -21,10 +21,7 @@ capabilities to the squad assignment list. The currently selected annotation is
 shown in the panel to the left of the unit list. Clicking on the arrow icon
 above the annotations will sort the unit list by that annotation value, or, if
 the list is already sorted by the annotation value, will switch between
-descending and ascending sort. Remember, vanilla forces units in other squads
-to appear at the end of the list, so the bottom of the list will be slightly
-out of order unless you have units from other squads filtered out (more
-information on the filters below).
+descending and ascending sort.
 
 Annotations and sort orders
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/plugins/sort.cpp b/plugins/sort.cpp
@@ -183,6 +183,9 @@ static void sort_set_filter_fn(color_ostream &out) {
         DEBUG(log).print("adding our filter function\n");
         auto filter_vec = reinterpret_cast<filter_vec_type *>(&unitlist->filter_func);
         filter_vec->emplace_back(do_filter);
+        DEBUG(log).print("clearing partitions\n"); // removes sorting other squads to end
+        auto partitions_vec = reinterpret_cast<filter_vec_type *>(&unitlist->partitions);
+        partitions_vec->clear();
         unitlist->sort_flags.bits.NEEDS_RESORTED = true;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,9 @@ static void sort_set_filter_fn(color_ostream &out) {`
`183`	`183`	`DEBUG(log).print("adding our filter function\n");`
`184`	`184`	`auto filter_vec = reinterpret_cast<filter_vec_type *>(&unitlist->filter_func);`
`185`	`185`	`filter_vec->emplace_back(do_filter);`
	`186`	`+ DEBUG(log).print("clearing partitions\n"); // removes sorting other squads to end`
	`187`	`+ auto partitions_vec = reinterpret_cast<filter_vec_type *>(&unitlist->partitions);`
	`188`	`+ partitions_vec->clear();`
`186`	`189`	`unitlist->sort_flags.bits.NEEDS_RESORTED = true;`
`187`	`190`	`}`
`188`	`191`	`}`