FilterCards()

3966279c · salix5 · c61af7f1 · 3966279c · 86121c09 · 77198cbb
Commit 3966279c authored Jan 16, 2016 by salix5
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

gframe/deck_con.cpp gframe/deck_con.cpp +1 -2

ocgcore ocgcore +1 -1

script script +1 -1

No files found.
--- a/gframe/deck_con.cpp
+++ b/gframe/deck_con.cpp
@@ -670,8 +670,7 @@ void DeckBuilder::FilterCards() {
 			continue;
 		switch(filter_type) {
 		case 1: {
-			int type2 = data.type & 0xe03ef1;
-			if(!(data.type & TYPE_MONSTER) || (filter_type2 == 0x21 && type2 != 0x21) || (data.type & filter_type2) != filter_type2)
+			if(!(data.type & TYPE_MONSTER) || (data.type & filter_type2) != filter_type2)
 				continue;
 			if(filter_race && data.race != filter_race)
 				continue;

--- a/ocgcore @ 86121c09
+++ b/ocgcore @ 86121c09
-Subproject commit 85d2b687cdbb4a3bb925a06cf66f0a46c1f08e08
+Subproject commit 86121c0956b51e9fdef38fe8acfe75af004c0abe
--- a/script @ 77198cbb
+++ b/script @ 77198cbb
-Subproject commit f0df5c7e608a8757ac84e521e3766347e752b252
+Subproject commit 77198cbbe34a52a7e92aae63b23926dd695308b4