sort card list by identifying column if value in selected column is equal

src/gui/control/card_list.cpp

@@ -199,12 +199,17 @@ bool CardListBase::compareItems(void* a, void* b) const {
 	FieldP sort_field = column_fields[sort_by_column];
 	ValueP va = reinterpret_cast<Card*>(a)->data[sort_field];
 	ValueP vb = reinterpret_cast<Card*>(b)->data[sort_field];
-	if (!va || !vb) return va < vb; // got to do something, compare pointers
+	assert(va && vb);
 	// compare sort keys
 	int cmp = smart_compare( va->getSortKey(), vb->getSortKey() );
 	if (cmp != 0) return cmp < 0;
 	// equal values, compare alternate sort key
-	// TODO: sort by a second column
+	if (alternate_sort_field) {
+		ValueP va = reinterpret_cast<Card*>(a)->data[alternate_sort_field];
+		ValueP vb = reinterpret_cast<Card*>(b)->data[alternate_sort_field];
+		int cmp = smart_compare( va->getSortKey(), vb->getSortKey() );
+		if (cmp != 0) return cmp < 0;
+	}
 	return false;
 }
 
@@ -250,6 +255,15 @@ void CardListBase::rebuild() {
 		}
 		++i;
 	}
+	// determine alternate sortImageFieldP ImageCardList::findImageField() {
+	alternate_sort_field = FieldP();
+	FOR_EACH(f, set->game->card_fields) {
+		if (f->identifying) {
+			alternate_sort_field = f;
+			break;
+		}
+	}
+	// refresh
 	refreshList();
 }
 

src/gui/control/card_list.hpp

@@ -125,6 +125,7 @@ class CardListBase : public ItemList, public SetView {
   private:
 	// display stuff
 	vector<FieldP> column_fields; ///< The field to use for each column (by column index)
+	FieldP alternate_sort_field;  ///< Second field to sort by, if the column doesn't suffice
 	
 	mutable wxListItemAttr item_attr; // for OnGetItemAttr