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

Merge pull request #8784 from JosJuice/memory-size-mismatch 

Don't assume fixed width for "Emulated memory size mismatch!" message
This commit is contained in:
Léo Lam 2020-05-02 02:11:57 +02:00 committed by GitHub
parent 66c91b9dfb b7db7ebbc7
commit c72b18361f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/FifoPlayer/FifoDataFile.cpp
View File

@ -258,8 +258,8 @@ std::unique_ptr<FifoDataFile> FifoDataFile::Load(const std::string& filename, bo
header.mem2_size != Memory::GetExRamSizeReal()) header.mem2_size != Memory::GetExRamSizeReal())
{ {
CriticalAlertT("Emulated memory size mismatch!\n" CriticalAlertT("Emulated memory size mismatch!\n"
"Current | MEM1 %08X (%3dMB) MEM2 %08X (%3dMB)\n" "Current: MEM1 %08X (%3d MiB), MEM2 %08X (%3d MiB)\n"
"DFF | MEM1 %08X (%3dMB) MEM2 %08X (%3dMB)", "DFF: MEM1 %08X (%3d MiB), MEM2 %08X (%3d MiB)",
Memory::GetRamSizeReal(), Memory::GetRamSizeReal() / 0x100000, Memory::GetRamSizeReal(), Memory::GetRamSizeReal() / 0x100000,
Memory::GetExRamSizeReal(), Memory::GetExRamSizeReal() / 0x100000, Memory::GetExRamSizeReal(), Memory::GetExRamSizeReal() / 0x100000,
header.mem1_size, header.mem1_size / 0x100000, header.mem2_size, header.mem1_size, header.mem1_size / 0x100000, header.mem2_size,