dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-04-09 02:51:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Antonino Di Guardo 2026-04-08 12:07:33 +02:00
parent 57f512843c
commit 3f0c27f5ff
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rpcs3/Loader/ISO.cpp
View File

@ -413,13 +413,8 @@ inline T retrieve_endian_int(const u8* buf)
return out;
}
<<<<<<< add_encrypted_iso
// Assumed that directory entry is at file head
static std::optional<iso_fs_metadata> iso_read_directory_entry(fs::file& file, bool names_in_ucs2 = false)
=======
// assumed that directory_entry is at file head
static std::optional<iso_fs_metadata> iso_read_directory_entry(fs::file& entry, bool names_in_ucs2 = false)
>>>>>>> master
{
const auto start_pos = entry.pos();
const u8 entry_length = entry.read<u8>();