Commit 0d49177a authored by salix5's avatar salix5

Refactor LoadSide method to use range-based for loops

parent f7aca72a
...@@ -220,22 +220,22 @@ uint32_t DeckManager::LoadDeckFromStream(Deck& deck, std::istringstream& deckStr ...@@ -220,22 +220,22 @@ uint32_t DeckManager::LoadDeckFromStream(Deck& deck, std::istringstream& deckStr
bool DeckManager::LoadSide(Deck& deck, uint32_t dbuf[], int mainc, int sidec) { bool DeckManager::LoadSide(Deck& deck, uint32_t dbuf[], int mainc, int sidec) {
std::unordered_map<uint32_t, int> pcount; std::unordered_map<uint32_t, int> pcount;
std::unordered_map<uint32_t, int> ncount; std::unordered_map<uint32_t, int> ncount;
for(size_t i = 0; i < deck.main.size(); ++i) for(auto card : deck.main)
pcount[deck.main[i]->code]++; pcount[card->code]++;
for(size_t i = 0; i < deck.extra.size(); ++i) for(auto card : deck.extra)
pcount[deck.extra[i]->code]++; pcount[card->code]++;
for(size_t i = 0; i < deck.side.size(); ++i) for(auto card : deck.side)
pcount[deck.side[i]->code]++; pcount[card->code]++;
Deck ndeck; Deck ndeck;
LoadDeck(ndeck, dbuf, mainc, sidec); LoadDeck(ndeck, dbuf, mainc, sidec);
if (ndeck.main.size() != deck.main.size() || ndeck.extra.size() != deck.extra.size() || ndeck.side.size() != deck.side.size()) if (ndeck.main.size() != deck.main.size() || ndeck.extra.size() != deck.extra.size() || ndeck.side.size() != deck.side.size())
return false; return false;
for(size_t i = 0; i < ndeck.main.size(); ++i) for(auto card : ndeck.main)
ncount[ndeck.main[i]->code]++; ncount[card->code]++;
for(size_t i = 0; i < ndeck.extra.size(); ++i) for(auto card : ndeck.extra)
ncount[ndeck.extra[i]->code]++; ncount[card->code]++;
for(size_t i = 0; i < ndeck.side.size(); ++i) for(auto card : ndeck.side)
ncount[ndeck.side[i]->code]++; ncount[card->code]++;
for (auto& cdit : ncount) for (auto& cdit : ncount)
if (cdit.second != pcount[cdit.first]) if (cdit.second != pcount[cdit.first])
return false; return false;
......
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