SysConf: Use range-based for loops in sysconf generation

Same thing, nicer looking
This commit is contained in:
Lioncash 2016-08-06 16:16:41 -04:00
parent 58b871e05c
commit 08bc19bf51
1 changed files with 11 additions and 11 deletions

View File

@ -330,9 +330,9 @@ void SysConf::GenerateSysConf()
// Write the header and item offsets // Write the header and item offsets
g.WriteBytes(&s_Header.version, sizeof(s_Header.version)); g.WriteBytes(&s_Header.version, sizeof(s_Header.version));
g.WriteBytes(&s_Header.numEntries, sizeof(u16)); g.WriteBytes(&s_Header.numEntries, sizeof(u16));
for (int i = 0; i != 27; ++i) for (const auto& item : items)
{ {
const u16 tmp_offset = Common::swap16(items[i].offset); const u16 tmp_offset = Common::swap16(item.offset);
g.WriteBytes(&tmp_offset, 2); g.WriteBytes(&tmp_offset, 2);
} }
const u16 end_data_offset = Common::swap16(current_offset); const u16 end_data_offset = Common::swap16(current_offset);
@ -340,30 +340,30 @@ void SysConf::GenerateSysConf()
// Write the items // Write the items
const u8 null_byte = 0; const u8 null_byte = 0;
for (int i = 0; i != 27; ++i) for (const auto& item : items)
{ {
u8 description = (items[i].type << 5) | (items[i].nameLength - 1); u8 description = (item.type << 5) | (item.nameLength - 1);
g.WriteBytes(&description, sizeof(description)); g.WriteBytes(&description, sizeof(description));
g.WriteBytes(&items[i].name, items[i].nameLength); g.WriteBytes(&item.name, item.nameLength);
switch (items[i].type) switch (item.type)
{ {
case Type_BigArray: case Type_BigArray:
{ {
const u16 tmpDataLength = Common::swap16(items[i].dataLength); const u16 tmpDataLength = Common::swap16(item.dataLength);
g.WriteBytes(&tmpDataLength, 2); g.WriteBytes(&tmpDataLength, 2);
g.WriteBytes(items[i].data, items[i].dataLength); g.WriteBytes(item.data, item.dataLength);
g.WriteBytes(&null_byte, 1); g.WriteBytes(&null_byte, 1);
} }
break; break;
case Type_SmallArray: case Type_SmallArray:
g.WriteBytes(&items[i].dataLength, 1); g.WriteBytes(&item.dataLength, 1);
g.WriteBytes(items[i].data, items[i].dataLength); g.WriteBytes(item.data, item.dataLength);
g.WriteBytes(&null_byte, 1); g.WriteBytes(&null_byte, 1);
break; break;
default: default:
g.WriteBytes(items[i].data, items[i].dataLength); g.WriteBytes(item.data, item.dataLength);
break; break;
} }
} }