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

Changed the DSP ROM warning from a panic alert to an on-screen message.

This commit is contained in:
skidau 2013-11-22 14:55:25 +11:00
parent ea9ac07ec9
commit efeb0096c9
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/Core/Src/DSP/DSPCore.cpp
View File

@ -113,13 +113,17 @@ static bool VerifyRoms(const char *irom_filename, const char *coef_filename)
} }
if (rom_idx == 1) if (rom_idx == 1)
PanicAlertT("You are using an old free DSP ROM made by the Dolphin Team.\n" {
"Only games using the Zelda UCode will work correctly.\n"); DSPHost_OSD_AddMessage("You are using an old free DSP ROM made by the Dolphin Team.", 6000);
DSPHost_OSD_AddMessage("Only games using the Zelda UCode will work correctly.", 6000);
}
if (rom_idx == 2) if (rom_idx == 2)
PanicAlertT("You are using a free DSP ROM made by the Dolphin Team.\n" {
"All Wii games will work correctly, and most GC games should " DSPHost_OSD_AddMessage("You are using a free DSP ROM made by the Dolphin Team.", 8000);
"also work fine, but the GBA/IPL/CARD UCodes will not work.\n"); DSPHost_OSD_AddMessage("All Wii games will work correctly, and most GC games should ", 8000);
DSPHost_OSD_AddMessage("also work fine, but the GBA/IPL/CARD UCodes will not work.\n", 8000);
}
return true; return true;
} }

1
Source/Core/Core/Src/DSP/DSPHost.h
View File

@ -12,6 +12,7 @@
u8 DSPHost_ReadHostMemory(u32 addr); u8 DSPHost_ReadHostMemory(u32 addr);
void DSPHost_WriteHostMemory(u8 value, u32 addr); void DSPHost_WriteHostMemory(u8 value, u32 addr);
void DSPHost_OSD_AddMessage(const std::string& str, u32 ms);
bool DSPHost_OnThread(); bool DSPHost_OnThread();
bool DSPHost_Wii(); bool DSPHost_Wii();
void DSPHost_InterruptRequest(); void DSPHost_InterruptRequest();

6
Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp
View File

@ -13,6 +13,7 @@
#include "../../ConfigManager.h" #include "../../ConfigManager.h"
#include "../../PowerPC/PowerPC.h" #include "../../PowerPC/PowerPC.h"
#include "Host.h" #include "Host.h"
#include "OnScreenDisplay.h"
// The user of the DSPCore library must supply a few functions so that the // The user of the DSPCore library must supply a few functions so that the
// emulation core can access the environment it runs in. If the emulation // emulation core can access the environment it runs in. If the emulation
@ -29,6 +30,11 @@ void DSPHost_WriteHostMemory(u8 value, u32 addr)
DSP::WriteARAM(value, addr); DSP::WriteARAM(value, addr);
} }
void DSPHost_OSD_AddMessage(const std::string& str, u32 ms)
{
OSD::AddMessage(str, ms);
}
bool DSPHost_OnThread() bool DSPHost_OnThread()
{ {
const SCoreStartupParameter& _CoreParameter = SConfig::GetInstance().m_LocalCoreStartupParameter; const SCoreStartupParameter& _CoreParameter = SConfig::GetInstance().m_LocalCoreStartupParameter;

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

@ -11,6 +11,7 @@
// Stub out the dsplib host stuff, since this is just a simple cmdline tools. // Stub out the dsplib host stuff, since this is just a simple cmdline tools.
u8 DSPHost_ReadHostMemory(u32 addr) { return 0; } u8 DSPHost_ReadHostMemory(u32 addr) { return 0; }
void DSPHost_WriteHostMemory(u8 value, u32 addr) {} void DSPHost_WriteHostMemory(u8 value, u32 addr) {}
void DSPHost_OSD_AddMessage(const std::string& str, u32 ms) {}
bool DSPHost_OnThread() { return false; } bool DSPHost_OnThread() { return false; }
bool DSPHost_Wii() { return false; } bool DSPHost_Wii() { return false; }
void DSPHost_CodeLoaded(const u8 *ptr, int size) {} void DSPHost_CodeLoaded(const u8 *ptr, int size) {}