mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-01 07:52:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Kill off some usages of the ArraySize macro.

Browse source 
This required the use of std::array in some cases.
This commit is contained in:
Lioncash 2014-02-15 01:12:13 -05:00
parent b2c0d5d5e6
commit 655d22512b
8 changed files with 44 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Source/Core/Core/PatchEngine.cpp
View file

@ -46,8 +46,8 @@ std::vector<Patch> onFrame;
std::map<u32, int> speedHacks;
std::vector<std::string> discList;
void LoadPatchSection(const char *section, std::vector<Patch> &patches,
IniFile &globalIni, IniFile &localIni)
void LoadPatchSection(const char *section, std::vector<Patch>& patches,
IniFile& globalIni, IniFile& localIni)
{
// Load the name of all enabled patches
std::string enabledSectionName = std::string(section) + "_Enabled";
@ -63,13 +63,13 @@ void LoadPatchSection(const char *section, std::vector<Patch> &patches,
}
}
IniFile* inis[] = {&globalIni, &localIni};
const IniFile* inis[2] = {&globalIni, &localIni};
for (size_t i = 0; i < ArraySize(inis); ++i)
for (const IniFile* ini : inis)
{
std::vector<std::string> lines;
Patch currentPatch;
inis[i]->GetLines(section, lines);
ini->GetLines(section, lines);
for (std::string& line : lines)
{
@ -86,7 +86,7 @@ void LoadPatchSection(const char *section, std::vector<Patch> &patches,
// Set active and name
currentPatch.name = line.substr(1, line.size() - 1);
currentPatch.active = enabledNames.find(currentPatch.name) != enabledNames.end();
currentPatch.user_defined = (i == 1);
currentPatch.user_defined = (ini == &localIni);
}
else
{