mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-09-12 12:32:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into wxw3-update

Browse source 
Conflicts:
	Source/Core/DolphinWX/Src/LogWindow.cpp
This commit is contained in:
Shawn Hoffman 2012-03-22 17:57:38 -07:00
commit f7423a0a4f
186 changed files with 1193 additions and 483 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/DiscIO/Src/VolumeDirectory.cpp
View file

@ -389,8 +389,8 @@ void CVolumeDirectory::BuildFST()
// write FST size and location
_dbg_assert_(DVDINTERFACE, m_diskHeader);
Write32((u32)(FST_ADDRESS >> m_addressShift), 0x0424, m_diskHeader);
Write32((u32)m_fstSize, 0x0428, m_diskHeader);
Write32((u32)m_fstSize, 0x042c, m_diskHeader);
Write32((u32)(m_fstSize >> m_addressShift), 0x0428, m_diskHeader);
Write32((u32)(m_fstSize >> m_addressShift), 0x042c, m_diskHeader);
}
void CVolumeDirectory::WriteToBuffer(u64 _SrcStartAddress, u64 _SrcLength, u8* _Src,