mirror of
https://github.com/RPCSX/rpcsx.git
synced 2026-04-06 06:55:09 +00:00
Conflicts fixed
This commit is contained in:
parent
e86a849600
commit
05c6a96d27
22 changed files with 501 additions and 132 deletions
|
|
@ -525,7 +525,7 @@ bool SELFDecrypter::GetKeyFromRap(u8 *content_id, u8 *npdrm_key)
|
|||
return false;
|
||||
}
|
||||
|
||||
ConLog.Write("Loading RAP file %s", ci_str + ".rap");
|
||||
ConLog.Write("Loading RAP file %s", ci_str.wc_str() + wchar_t(".rap"));
|
||||
rap_file.Read(rap_key, 0x10);
|
||||
rap_file.Close();
|
||||
|
||||
|
|
@ -671,4 +671,4 @@ bool DecryptSelf(const std::string& elf, const std::string& self)
|
|||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue