AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-07-04 15:55:51 +00:00
Code Issues Projects Releases Wiki Activity

AROTBuilder: Eliminate variable shadowing

Browse Source
This commit is contained in:
Lioncash 2020-03-31 07:27:19 -04:00
parent a2709f1d20
commit 84141eeb25
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
DataSpec/DNACommon/AROTBuilder.cpp
View File

@ -347,20 +347,22 @@ void AROTBuilder::build(std::vector<std::vector<uint8_t>>& secs, const zeus::CAA
auto bmpIt = bmp.cbegin(); auto bmpIt = bmp.cbegin();
if (bmpIt != bmp.cend()) { if (bmpIt != bmp.cend()) {
int curIdx = 0; int curIdx = 0;
for (size_t w = 0; w < bmpWordCount; ++w) { for (size_t word = 0; word < bmpWordCount; ++word) {
for (int b = 0; b < 32; ++b) { for (u32 b = 0; b < 32; ++b) {
if (*bmpIt == curIdx) { if (*bmpIt == curIdx) {
bmpWords[w] |= 1 << b; bmpWords[word] |= 1U << b;
++bmpIt; ++bmpIt;
if (bmpIt == bmp.cend()) if (bmpIt == bmp.cend()) {
break; break;
} }
}
++curIdx; ++curIdx;
} }
if (bmpIt == bmp.cend()) if (bmpIt == bmp.cend()) {
break; break;
} }
} }
}
for (uint32_t word : bmpWords) for (uint32_t word : bmpWords)
w.writeUint32Big(word); w.writeUint32Big(word);