Skip to content

Y
ygopro
Commit bee45faa authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into server

parents f9bae21b 0f511244
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
gframe/deck_manager.cpp
View file @ bee45faa
......@@ -157,13 +157,14 @@ 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) &&
else if(cd.type & (TYPE_FUSION | TYPE_SYNCHRO | TYPE_XYZ | TYPE_LINK)) {
if(
#ifdef YGOPRO_SERVER_MODE
deck.extra.size() < DECKCOUNT_EXTRA
deck.extra.size() >= DECKCOUNT_EXTRA
#else
deck.extra.size() < 15
deck.extra.size() >= 15
#endif
) {
)
deck.extra.push_back(dataManager.GetCodePointer(code)); //verified by GetData()
} else
#ifdef YGOPRO_SERVER_MODE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment