ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SysConf: Simplify entry generation 

Just use a vector and move it instead of manually pushing them one-by-one.
This commit is contained in:
Lioncash 2016-08-06 16:02:44 -04:00
parent facf02686a
commit 58b871e05c
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Common/SysConf.cpp
View File

@ -206,8 +206,7 @@ void SysConf::GenerateSysConf()
strncpy(s_Header.version, "SCv0", 4); strncpy(s_Header.version, "SCv0", 4);
s_Header.numEntries = Common::swap16(28 - 1); s_Header.numEntries = Common::swap16(28 - 1);
SSysConfEntry items[27]; std::vector<SSysConfEntry> items(27);
memset(items, 0, sizeof(SSysConfEntry) * 27);
// version length + size of numEntries + 28 * size of offset // version length + size of numEntries + 28 * size of offset
unsigned int current_offset = 4 + 2 + 28 * 2; unsigned int current_offset = 4 + 2 + 28 * 2;
@ -325,9 +324,6 @@ void SysConf::GenerateSysConf()
current_offset += create_item(items[26], Type_Bool, "MPLS.MOVIE", 1, current_offset); current_offset += create_item(items[26], Type_Bool, "MPLS.MOVIE", 1, current_offset);
items[26].data[0] = 0x01; items[26].data[0] = 0x01;
for (const SSysConfEntry& item : items)
m_Entries.push_back(item);
File::CreateFullPath(m_FilenameDefault); File::CreateFullPath(m_FilenameDefault);
File::IOFile g(m_FilenameDefault, "wb"); File::IOFile g(m_FilenameDefault, "wb");
@ -380,6 +376,7 @@ void SysConf::GenerateSysConf()
// Write the footer // Write the footer
g.WriteBytes("SCed", 4); g.WriteBytes("SCed", 4);
m_Entries = std::move(items);
m_Filename = m_FilenameDefault; m_Filename = m_FilenameDefault;
m_IsValid = true; m_IsValid = true;
} }