piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only initialize the Wiimote plugin if booting in Wii mode.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1535 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2008-12-14 20:01:01 +00:00
parent 0412d0811a
commit 64a74c2ba4
3 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -304,12 +304,14 @@ THREAD_RETURN EmuThread(void *pArg)
PADInitialize.pLog = Callback_PADLog;
PluginPAD::PAD_Initialize(PADInitialize);
// Load and Init WiimotePlugin
SWiimoteInitialize WiimoteInitialize;
WiimoteInitialize.hWnd = g_pWindowHandle;
WiimoteInitialize.pLog = Callback_WiimoteLog;
WiimoteInitialize.pWiimoteInput = Callback_WiimoteInput;
PluginWiimote::Wiimote_Initialize(WiimoteInitialize);
// Load and Init WiimotePlugin - only if we are booting in wii mode
if (_CoreParameter.bWii) {
SWiimoteInitialize WiimoteInitialize;
WiimoteInitialize.hWnd = g_pWindowHandle;
WiimoteInitialize.pLog = Callback_WiimoteLog;
WiimoteInitialize.pWiimoteInput = Callback_WiimoteInput;
PluginWiimote::Wiimote_Initialize(WiimoteInitialize);
}
// The hardware is initialized.
g_bHwInit = true;
@ -385,8 +387,11 @@ THREAD_RETURN EmuThread(void *pArg)
PluginPAD::PAD_Shutdown();
PluginPAD::UnloadPlugin();
PluginWiimote::Wiimote_Shutdown();
PluginWiimote::UnloadPlugin();
if (_CoreParameter.bWii)
{
PluginWiimote::Wiimote_Shutdown();
PluginWiimote::UnloadPlugin();
}
PluginDSP::DSP_Shutdown();
PluginDSP::UnloadPlugin();
PluginVideo::Video_Shutdown();

15
Source/Core/Core/Src/HW/HW.cpp
View File

@ -64,9 +64,11 @@ namespace HW
ExpansionInterface::Init();
CCPU::Init();
SystemTimers::Init();
WII_IPC_HLE_Interface::Init();
WII_IPCInterface::Init();
if (Core::GetStartupParameter().bWii)
{
WII_IPC_HLE_Interface::Init();
WII_IPCInterface::Init();
}
}
void Shutdown()
@ -80,8 +82,11 @@ namespace HW
SerialInterface::Shutdown();
AudioInterface::Shutdown();
WII_IPC_HLE_Interface::Shutdown();
WII_IPCInterface::Shutdown();
if (Core::GetStartupParameter().bWii)
{
WII_IPC_HLE_Interface::Shutdown();
WII_IPCInterface::Shutdown();
}
State_Shutdown();
Thunk_Shutdown();

2
Source/Core/DolphinWX/Src/BootManager.cpp
View File

@ -105,7 +105,7 @@ bool BootCore(const std::string& _rFilename)
#endif
#endif
if ( !StartUp.AutoSetup(SCoreStartupParameter::BOOT_DEFAULT) )
if (!StartUp.AutoSetup(SCoreStartupParameter::BOOT_DEFAULT))
{
return false;
}