Commit a4c332a5 authored by nanahira's avatar nanahira

revert dl banlist

parent db521770
Pipeline #40736 passed with stages
in 10 minutes and 5 seconds
...@@ -210,9 +210,6 @@ unsigned int DeckManager::CheckDeck(const Deck& deck, unsigned int lfhash, int r ...@@ -210,9 +210,6 @@ unsigned int DeckManager::CheckDeck(const Deck& deck, unsigned int lfhash, int r
} }
return (uint32_t)0; return (uint32_t)0;
}; };
char remaining_limit[4]{};
for (int i = 0; i < 4; ++i)
remaining_limit[i] = i;
const unsigned int rule_map[6] = { AVAIL_OCG, AVAIL_TCG, AVAIL_SC, AVAIL_CUSTOM, AVAIL_OCGTCG, 0 }; const unsigned int rule_map[6] = { AVAIL_OCG, AVAIL_TCG, AVAIL_SC, AVAIL_CUSTOM, AVAIL_OCGTCG, 0 };
unsigned int avail = 0; unsigned int avail = 0;
if (rule >= 0 && rule < (int)(sizeof rule_map / sizeof rule_map[0])) if (rule >= 0 && rule < (int)(sizeof rule_map / sizeof rule_map[0]))
...@@ -229,14 +226,8 @@ unsigned int DeckManager::CheckDeck(const Deck& deck, unsigned int lfhash, int r ...@@ -229,14 +226,8 @@ unsigned int DeckManager::CheckDeck(const Deck& deck, unsigned int lfhash, int r
if(dc > 3) if(dc > 3)
return (DECKERROR_CARDCOUNT << 28) | cit->first; return (DECKERROR_CARDCOUNT << 28) | cit->first;
auto it = list.find(code); auto it = list.find(code);
if(it != list.end()) { if(it != list.end() && dc > it->second)
auto limit = it->second; return (DECKERROR_LFLIST << 28) | cit->first;
if(limit > 3)
limit = 3;
if(remaining_limit[limit] == 0)
return (DECKERROR_LFLIST << 28) | cit->first;
--remaining_limit[limit];
}
auto spend_credit_error = spend_credit(code); auto spend_credit_error = spend_credit(code);
if(spend_credit_error) if(spend_credit_error)
return spend_credit_error; return spend_credit_error;
...@@ -253,14 +244,8 @@ unsigned int DeckManager::CheckDeck(const Deck& deck, unsigned int lfhash, int r ...@@ -253,14 +244,8 @@ unsigned int DeckManager::CheckDeck(const Deck& deck, unsigned int lfhash, int r
if(dc > 3) if(dc > 3)
return (DECKERROR_CARDCOUNT << 28) | cit->first; return (DECKERROR_CARDCOUNT << 28) | cit->first;
auto it = list.find(code); auto it = list.find(code);
if(it != list.end()) { if(it != list.end() && dc > it->second)
auto limit = it->second; return (DECKERROR_LFLIST << 28) | cit->first;
if(limit > 3)
limit = 3;
if(remaining_limit[limit] == 0)
return (DECKERROR_LFLIST << 28) | cit->first;
--remaining_limit[limit];
}
auto spend_credit_error = spend_credit(code); auto spend_credit_error = spend_credit(code);
if(spend_credit_error) if(spend_credit_error)
return spend_credit_error; return spend_credit_error;
...@@ -277,14 +262,8 @@ unsigned int DeckManager::CheckDeck(const Deck& deck, unsigned int lfhash, int r ...@@ -277,14 +262,8 @@ unsigned int DeckManager::CheckDeck(const Deck& deck, unsigned int lfhash, int r
if(dc > 3) if(dc > 3)
return (DECKERROR_CARDCOUNT << 28) | cit->first; return (DECKERROR_CARDCOUNT << 28) | cit->first;
auto it = list.find(code); auto it = list.find(code);
if(it != list.end()) { if(it != list.end() && dc > it->second)
auto limit = it->second; return (DECKERROR_LFLIST << 28) | cit->first;
if(limit > 3)
limit = 3;
if(remaining_limit[limit] == 0)
return (DECKERROR_LFLIST << 28) | cit->first;
--remaining_limit[limit];
}
auto spend_credit_error = spend_credit(code); auto spend_credit_error = spend_credit(code);
if(spend_credit_error) if(spend_credit_error)
return spend_credit_error; return spend_credit_error;
......
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