Skip to content

Y
ygopro
Commit 8107c321 authored by edo9300's avatar edo9300
Browse files
Options

Fix

parent d608f949
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
gframe/deck_con.cpp
View file @ 8107c321
...@@ -982,7 +982,7 @@ bool DeckBuilder::push_main(code_pointer pointer, int seq) { ...@@ -982,7 +982,7 @@ bool DeckBuilder::push_main(code_pointer pointer, int seq) {
if(pointer->second.type & (TYPE_FUSION | TYPE_SYNCHRO | TYPE_XYZ | TYPE_LINK)) if(pointer->second.type & (TYPE_FUSION | TYPE_SYNCHRO | TYPE_XYZ | TYPE_LINK))
return false; return false;
auto& container = deckManager.current_deck.main; auto& container = deckManager.current_deck.main;
if(!mainGame->is_siding) if(!mainGame->is_siding && (int)container.size() >= 60)
return false; return false;
if(seq >= 0 && seq < (int)container.size()) if(seq >= 0 && seq < (int)container.size())
container.insert(container.begin() + seq, pointer); container.insert(container.begin() + seq, pointer);
...@@ -995,7 +995,7 @@ bool DeckBuilder::push_extra(code_pointer pointer, int seq) { ...@@ -995,7 +995,7 @@ bool DeckBuilder::push_extra(code_pointer pointer, int seq) {
if(!(pointer->second.type & (TYPE_FUSION | TYPE_SYNCHRO | TYPE_XYZ | TYPE_LINK))) if(!(pointer->second.type & (TYPE_FUSION | TYPE_SYNCHRO | TYPE_XYZ | TYPE_LINK)))
return false; return false;
auto& container = deckManager.current_deck.extra; auto& container = deckManager.current_deck.extra;
if(!mainGame->is_siding) if(!mainGame->is_siding && (int)container.size() >= 15)
return false; return false;
if(seq >= 0 && seq < (int)container.size()) if(seq >= 0 && seq < (int)container.size())
container.insert(container.begin() + seq, pointer); container.insert(container.begin() + seq, pointer);
...@@ -1006,7 +1006,7 @@ bool DeckBuilder::push_extra(code_pointer pointer, int seq) { ...@@ -1006,7 +1006,7 @@ bool DeckBuilder::push_extra(code_pointer pointer, int seq) {
} }
bool DeckBuilder::push_side(code_pointer pointer, int seq) { bool DeckBuilder::push_side(code_pointer pointer, int seq) {
auto& container = deckManager.current_deck.side; auto& container = deckManager.current_deck.side;
if(!mainGame->is_siding) if(!mainGame->is_siding && (int)container.size() >= 15)
return false; return false;
if(seq >= 0 && seq < (int)container.size()) if(seq >= 0 && seq < (int)container.size())
container.insert(container.begin() + seq, pointer); container.insert(container.begin() + seq, pointer);
......
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