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

Fix the palette loading fix to not crash MP2 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1009 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2008-10-29 22:28:57 +00:00
parent c18bcca4a8
commit 39abe6a9a3
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/Src/Core.cpp
View File

@ -276,6 +276,7 @@ THREAD_RETURN EmuThread(void *pArg)
VideoInitialize.pUpdateInterrupts = &(CommandProcessor::UpdateInterruptsFromVideoPlugin);
VideoInitialize.pMemoryBase = Memory::base;
VideoInitialize.pKeyPress = Callback_KeyPress;
VideoInitialize.bWii = _CoreParameter.bWii;
PluginVideo::Video_Initialize(&VideoInitialize);
// Under linux, this is an X11 Display, not an HWND!

5
Source/Core/Core/Src/HW/Memmap.cpp
View File

@ -906,7 +906,10 @@ u8 *GetPointer(const u32 _Address)
case 0xD1:
case 0xD2:
case 0xD3:
return (u8*)(((char*)m_pEXRAM) + (_Address&EXRAM_MASK));
if (Core::GetStartupParameter().bWii)
return (u8*)(((char*)m_pEXRAM) + (_Address&EXRAM_MASK));
else
return 0;
case 0xE0:
if (_Address < (0xE0000000 + L1_CACHE_SIZE))