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

If you're Wiimotes input was a real Wiimote and you decided to play a Gamecube Game, then you'd eventually get the message "Wiimote has been disconnected", and it would harshly mess up your game play. Fixed it so that message only appears during Wii game play. Should we checked if Wiimote was ever connected for that gaming session? 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4925 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
interdpth 2010-01-22 23:24:43 +00:00
parent 68a4eacb62
commit 267fd392d7
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Source/Core/DolphinWX/Src/Frame.cpp
View File

@ -161,25 +161,27 @@ CPanel::CPanel(
return 0; return 0;
case WIIMOTE_DISCONNECT: case WIIMOTE_DISCONNECT:
if (main_frame->bNoWiimoteMsg) if( SConfig::GetInstance().m_LocalCoreStartupParameter.bWii ){ //Only Alerts if the game is a wii game.
main_frame->bNoWiimoteMsg = false; if (main_frame->bNoWiimoteMsg)
else main_frame->bNoWiimoteMsg = false;
{ else
// The Wiimote has been disconnect, we offer reconnect here {
wxMessageDialog *dlg = new wxMessageDialog( // The Wiimote has been disconnect, we offer reconnect here
this, wxMessageDialog *dlg = new wxMessageDialog(
wxString::Format(wxT("Wiimote %i has been disconnected by system.\n") this,
wxT("Maybe this game doesn't support multi-wiimote,\n") wxString::Format(wxT("Wiimote %i has been disconnected by system.\n")
wxT("or maybe it is due to idle time out or other reason.\n\n") wxT("Maybe this game doesn't support multi-wiimote,\n")
wxT("Do you want to reconnect immediately?"), lParam + 1), wxT("or maybe it is due to idle time out or other reason.\n\n")
wxT("Reconnect Wiimote Confirm"), wxT("Do you want to reconnect immediately?"), lParam + 1),
wxYES_NO | wxSTAY_ON_TOP | wxICON_INFORMATION, //wxICON_QUESTION, wxT("Reconnect Wiimote Confirm"),
wxDefaultPosition); wxYES_NO | wxSTAY_ON_TOP | wxICON_INFORMATION, //wxICON_QUESTION,
wxDefaultPosition);
if (dlg->ShowModal() == wxID_YES) if (dlg->ShowModal() == wxID_YES)
GetUsbPointer()->AccessWiiMote(lParam | 0x100)->Activate(true); GetUsbPointer()->AccessWiiMote(lParam | 0x100)->Activate(true);
dlg->Destroy(); dlg->Destroy();
}
} }
return 0; return 0;
} }