fix incorrect side deck check

ec70129b · nanahira · GitHub · 820e9b2e · ec70129b
Commit ec70129b authored Jan 06, 2020 by nanahira Committed by GitHub Jan 06, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

gframe/deck_manager.cpp gframe/deck_manager.cpp +3 -1

No files found.
--- a/gframe/deck_manager.cpp
+++ b/gframe/deck_manager.cpp
@@ -147,7 +147,9 @@ int DeckManager::LoadDeck(Deck& deck, int* dbuf, int mainc, int sidec) {
 		}
 		if(cd.type & TYPE_TOKEN)
 			continue;
-		else if(cd.type & (TYPE_FUSION | TYPE_SYNCHRO | TYPE_XYZ | TYPE_LINK) && deck.extra.size() < 15) {
+		else if(cd.type & (TYPE_FUSION | TYPE_SYNCHRO | TYPE_XYZ | TYPE_LINK)) {
+			if(deck.extra.size() >= 15)
+				continue;
 			deck.extra.push_back(dataManager.GetCodePointer(code));	//verified by GetData()
 		} else if(deck.main.size() < 60) {
 			deck.main.push_back(dataManager.GetCodePointer(code));