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

Still didn't quite have the wiimote connection stuff right. This probably needs to be heavily revised. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7232 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2011-02-23 16:00:01 +00:00
parent 9680d3ac95
commit 1eaad0966c
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/Common/Src/MsgHandler.cpp
View File

@ -54,7 +54,6 @@ bool MsgAlert(bool yes_no, int Style, const char* format, ...)
// Read message and write it to the log // Read message and write it to the log
std::string caption; std::string caption;
char buffer[2048]; char buffer[2048];
bool ret = true;
static std::string info_caption; static std::string info_caption;
static std::string warn_caption; static std::string warn_caption;
@ -88,10 +87,10 @@ bool MsgAlert(bool yes_no, int Style, const char* format, ...)
ERROR_LOG(MASTER_LOG, "%s: %s", caption.c_str(), buffer); ERROR_LOG(MASTER_LOG, "%s: %s", caption.c_str(), buffer);
// Don't ignore questions, especially AskYesNo, PanicYesNo could be ignored // Don't ignore questions, especially AskYesNo, PanicYesNo could be ignored
if (msg_handler && (AlertEnabled || Style == QUESTION)) { if (msg_handler && (AlertEnabled || Style == QUESTION))
ret = msg_handler(caption.c_str(), buffer, yes_no, Style); return msg_handler(caption.c_str(), buffer, yes_no, Style);
}
return ret; return true;
} }
// Default non library depended panic alert // Default non library depended panic alert

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

@ -144,7 +144,7 @@ void WiimoteConfigPage::UpdateWiimoteStatus()
// Connect wiimotes // Connect wiimotes
if (WIIMOTE_SRC_EMU & g_wiimote_sources[m_index]) if (WIIMOTE_SRC_EMU & g_wiimote_sources[m_index])
CFrame::ConnectWiimote(m_index, true); CFrame::ConnectWiimote(m_index, true);
else if (WIIMOTE_SRC_REAL & g_wiimote_sources[m_index] && orig_source & WIIMOTE_SRC_EMU) else if (WIIMOTE_SRC_REAL & g_wiimote_sources[m_index])
CFrame::ConnectWiimote(m_index, WiimoteReal::g_wiimotes[m_index]->IsConnected()); CFrame::ConnectWiimote(m_index, WiimoteReal::g_wiimotes[m_index]->IsConnected());
} }
} }