mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-21 05:09:34 -06:00
Change some for+iterator loops in GeckoCode.cpp and GeckoCodeConfig.cpp into foreach loops.
This commit is contained in:
@ -17,14 +17,12 @@ namespace Gecko
|
||||
// return true if a code exists
|
||||
bool GeckoCode::Exist(u32 address, u32 data)
|
||||
{
|
||||
std::vector<GeckoCode::Code>::const_iterator
|
||||
codes_iter = codes.begin(),
|
||||
codes_end = codes.end();
|
||||
for (; codes_iter != codes_end; ++codes_iter)
|
||||
for (const GeckoCode::Code& code : codes)
|
||||
{
|
||||
if (codes_iter->address == address && codes_iter->data == data)
|
||||
if (code.address == address && code.data == data)
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -35,14 +33,13 @@ bool GeckoCode::Compare(GeckoCode compare) const
|
||||
return false;
|
||||
|
||||
unsigned int exist = 0;
|
||||
std::vector<GeckoCode::Code>::const_iterator
|
||||
codes_iter = codes.begin(),
|
||||
codes_end = codes.end();
|
||||
for (; codes_iter != codes_end; ++codes_iter)
|
||||
|
||||
for (const GeckoCode::Code& code : codes)
|
||||
{
|
||||
if (compare.Exist(codes_iter->address, codes_iter->data))
|
||||
if (compare.Exist(code.address, code.data))
|
||||
exist++;
|
||||
}
|
||||
|
||||
return exist == codes.size();
|
||||
}
|
||||
|
||||
@ -56,17 +53,15 @@ void SetActiveCodes(const std::vector<GeckoCode>& gcodes)
|
||||
std::lock_guard<std::mutex> lk(active_codes_lock);
|
||||
|
||||
active_codes.clear();
|
||||
|
||||
// add enabled codes
|
||||
std::vector<GeckoCode>::const_iterator
|
||||
gcodes_iter = gcodes.begin(),
|
||||
gcodes_end = gcodes.end();
|
||||
for (; gcodes_iter!=gcodes_end; ++gcodes_iter)
|
||||
for (const GeckoCode& geckoCode : gcodes)
|
||||
{
|
||||
if (gcodes_iter->enabled)
|
||||
if (geckoCode.enabled)
|
||||
{
|
||||
// TODO: apply modifiers
|
||||
// TODO: don't need description or creator string, just takin up memory
|
||||
active_codes.push_back(*gcodes_iter);
|
||||
active_codes.push_back(geckoCode);
|
||||
}
|
||||
}
|
||||
|
||||
@ -101,14 +96,12 @@ bool InstallCodeHandler()
|
||||
std::lock_guard<std::mutex> lk(active_codes_lock);
|
||||
|
||||
int i = 0;
|
||||
std::vector<GeckoCode>::iterator
|
||||
gcodes_iter = active_codes.begin(),
|
||||
gcodes_end = active_codes.end();
|
||||
for (; gcodes_iter!=gcodes_end; ++gcodes_iter)
|
||||
|
||||
for (GeckoCode& activeCode : active_codes)
|
||||
{
|
||||
if (gcodes_iter->enabled)
|
||||
if (activeCode.enabled)
|
||||
{
|
||||
for (auto& code : gcodes_iter->codes)
|
||||
for (GeckoCode::Code& code : activeCode.codes)
|
||||
{
|
||||
// Make sure we have enough memory to hold the code list
|
||||
if ((codelist_location + 24 + i) < 0x80003000)
|
||||
|
Reference in New Issue
Block a user