Card list colors are determined by a script instead of card_list_colors of a choice field (although that is still the default)

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@454 0fc631ac-6414-0410-93d0-97cfa31319b6

src/gui/control/card_list.cpp

@@ -185,6 +185,8 @@ void CardListBase::rebuild() {
 	selected_item_pos = -1;
 	onRebuild();
 	if (!set) return;
+	// init stuff
+	set->game->initCardListColorScript();
 	// determine column order
 	map<int,FieldP> new_column_fields;
 	FOR_EACH(f, set->game->card_fields) {
@@ -205,8 +207,6 @@ void CardListBase::rebuild() {
 		             align, cs.width);
 		column_fields.push_back(f.second);
 	}
-	// find field that determines color
-	color_field = findColorField();
 	// determine sort settings
 	GameSettings& gs = settings.gameSettingsFor(*set->game);
 	sort_ascending = gs.sort_cards_ascending;
@@ -224,16 +224,6 @@ void CardListBase::rebuild() {
 	refreshList();
 }
 
-ChoiceFieldP CardListBase::findColorField() {
-	FOR_EACH(s, set->game->card_fields) {
-		ChoiceFieldP cf = dynamic_pointer_cast<ChoiceField>(s);
-		if (cf && !cf->choice_colors_cardlist.empty()) {
-			return cf;
-		}
-	}
-	return ChoiceFieldP();
-}
-
 // ----------------------------------------------------------------------------- : CardListBase : Columns
 
 void CardListBase::storeColumns() {
@@ -279,10 +269,9 @@ int CardListBase::OnGetItemImage(long pos) const {
 }
 
 wxListItemAttr* CardListBase::OnGetItemAttr(long pos) const {
-	if (!color_field) return nullptr;
-	ChoiceValueP val = static_pointer_cast<ChoiceValue>( getCard(pos)->data[color_field]);
-	assert(val);
-	item_attr.SetTextColour(color_field->choice_colors_cardlist[val->value()]); // if it doesn't exist we get black
+	if (!set->game->card_list_color_script) return nullptr;
+	Context& ctx = set->getContext(getCard(pos));
+	item_attr.SetTextColour(*set->game->card_list_color_script.invoke(ctx));
 	return &item_attr;
 }