summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorJohn Peterson <jpeterson57@gmail.com>2008-11-20 08:46:16 +0000
committerJohn Peterson <jpeterson57@gmail.com>2008-11-20 08:46:16 +0000
commit5fb23f879e40d4967e4044e463f839600a306cbb (patch)
treeeae7d568fe906ed8c7dcc5742dac5a2c1dada0a9 /Source/Core
parentaabee66444d1961c012eaa38a873578516566ee8 (diff)
Fixed emulated Nunchuck in Mario Galaxy and Wii Sports
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1222 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp3
-rw-r--r--Source/Core/DolphinWX/Src/BootManager.cpp2
-rw-r--r--Source/Core/DolphinWX/Src/ConfigMain.cpp2
3 files changed, 4 insertions, 3 deletions
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
index 448c308a25..841c129736 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
@@ -944,7 +944,7 @@ namespace Core
{
LOGV(WII_IPC_WIIMOTE, 3, "=========================================================");
const u8* pData = (const u8*)_pData;
- LOGV(WII_IPC_WIIMOTE, 3, "Callback_WiimoteInput: 0x%x", _channelID);
+ LOGV(WII_IPC_WIIMOTE, 3, "Callback_WiimoteInput:");
std::string Temp;
for (u32 j=0; j<_Size; j++)
{
@@ -953,6 +953,7 @@ namespace Core
Temp.append(Buffer);
}
LOGV(WII_IPC_WIIMOTE, 3, " Data: %s", Temp.c_str());
+ //LOGV(WII_IPC_WIIMOTE, 3, " Channel: %s", _channelID);
s_Usb->m_WiiMotes[0].SendL2capData(_channelID, _pData, _Size);
LOGV(WII_IPC_WIIMOTE, 3, "=========================================================");
diff --git a/Source/Core/DolphinWX/Src/BootManager.cpp b/Source/Core/DolphinWX/Src/BootManager.cpp
index dbb993f73d..0242c763d4 100644
--- a/Source/Core/DolphinWX/Src/BootManager.cpp
+++ b/Source/Core/DolphinWX/Src/BootManager.cpp
@@ -142,7 +142,7 @@ bool BootCore(const std::string& _rFilename)
}
else
{
- PanicAlert("Could not write to SYSCONF");
+ PanicAlert("Could not read %sSYSCONF", FULL_CONFIG_DIR);
}
// ----------------
}
diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp
index 89e48be330..b9c72c8f92 100644
--- a/Source/Core/DolphinWX/Src/ConfigMain.cpp
+++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp
@@ -72,7 +72,7 @@ CConfigMain::CConfigMain(wxWindow* parent, wxWindowID id, const wxString& title,
}
else
{
- PanicAlert("Could not read Wii SYSCONF");
+ PanicAlert("Could not read " FULL_CONFIG_DIR "SYSCONF");
}
CreateGUIControls();