fix

f9bd1ec3 · VanillaSalt · 4876b949 · f9bd1ec3
Commit f9bd1ec3 authored Dec 21, 2016 by VanillaSalt
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

card.cpp card.cpp +3 -3

No files found.
--- a/card.cpp
+++ b/card.cpp
@@ -3002,9 +3002,9 @@ int32 card::is_can_be_fusion_material(card* fcard) {
 	for(int32 i = 0; i < eset.size(); ++i)
 		if(eset[i]->get_value(fcard))
 			return FALSE;
-	if(current.location == LOCATION_SZONE) {
-		eset.clear();
-		filter_effect(EFFECT_EXTRA_FUSION_MATERIAL, &eset);
+	eset.clear();
+	filter_effect(EFFECT_EXTRA_FUSION_MATERIAL, &eset);
+	if(eset.size()) {
 		for(int32 i = 0; i < eset.size(); ++i)
 			if(eset[i]->get_value(fcard))
 				return TRUE;