Some code simplified

This commit is contained in:
Nekotekina 2015-04-21 22:43:40 +03:00
parent 8b0c772423
commit 5aa6daf58f
2 changed files with 12 additions and 5 deletions

View file

@ -337,7 +337,14 @@ __noinline s32 savedata_op(
if (selected >= 0)
{
save_entry.dirName = std::move(save_entries[selected < save_entries.size() ? selected : throw __FUNCTION__].dirName);
if (selected < save_entries.size())
{
save_entry.dirName = std::move(save_entries[selected].dirName);
}
else
{
throw __FUNCTION__;
}
}
}

View file

@ -127,11 +127,11 @@ bool PSFLoader::Save(vfsStream& stream) const
header.version = 0x101;
header.entries_num = static_cast<u32>(m_entries.size());
header.off_key_table = sizeof(PSFHeader) + sizeof(PSFDefTable) * header.entries_num;
header.off_data_table = header.off_key_table + [&]() -> u32
{
// calculate key table length and generate indices
u32 key_offset = 0;
u32& key_offset = header.off_data_table = 0;
u32 data_offset = 0;
for (u32 i = 0; i < m_entries.size(); i++)
@ -161,9 +161,9 @@ bool PSFLoader::Save(vfsStream& stream) const
}
}
}
}
return key_offset;
}();
header.off_data_table += header.off_key_table;
// save header
if (!stream.SWrite(header))