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

Clean up some messy code issues that have been annoying me.

This commit is contained in:
Glenn Rice 2012-12-28 09:58:06 -06:00
parent af2820ac88
commit c303669dd0
6 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
View File

@ -387,7 +387,7 @@ void ExecuteCommand(u32 _Address)
INFO_LOG(WII_IPC_FILEIO, "IOP: Open File (Device=%s, ID=%08x, Mode=%i)", INFO_LOG(WII_IPC_FILEIO, "IOP: Open File (Device=%s, ID=%08x, Mode=%i)",
pDevice->GetDeviceName().c_str(), DeviceID, Mode); pDevice->GetDeviceName().c_str(), DeviceID, Mode);
if (Memory::Read_U32(_Address + 4) == DeviceID) if (Memory::Read_U32(_Address + 4) == (u32)DeviceID)
{ {
g_FdMap[DeviceID] = pDevice; g_FdMap[DeviceID] = pDevice;
} }

4
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
View File

@ -789,8 +789,8 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
{ {
static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = GetUsbPointer(); static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = GetUsbPointer();
bool* wiiMoteConnected = new bool[s_Usb->m_WiiMotes.size()]; bool* wiiMoteConnected = new bool[s_Usb->m_WiiMotes.size()];
for(unsigned int i = 0; i < s_Usb->m_WiiMotes.size(); for (unsigned int i = 0; i < s_Usb->m_WiiMotes.size(); i++)
i++) wiiMoteConnected[i] = s_Usb->m_WiiMotes[i].IsConnected(); wiiMoteConnected[i] = s_Usb->m_WiiMotes[i].IsConnected();
std::string tContentFile(m_ContentFile.c_str()); std::string tContentFile(m_ContentFile.c_str());
WII_IPC_HLE_Interface::Reset(true); WII_IPC_HLE_Interface::Reset(true);

2
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h
View File

@ -31,7 +31,7 @@ struct NANDStat
}; };
enum { enum {
FS_RESULT_OK = 0, FS_RESULT_OK = 0,
FS_INVALID = -4, FS_INVALID = -4,
FS_DIRFILE_NOT_FOUND = -6, FS_DIRFILE_NOT_FOUND = -6,
FS_RESULT_FATAL = -101, FS_RESULT_FATAL = -101,

40
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
View File

@ -116,26 +116,26 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::DoState(PointerWrap &p)
p.Do(m_EventQueue); p.Do(m_EventQueue);
m_acl_pool.DoState(p); m_acl_pool.DoState(p);
for (unsigned int i = 0; i < 4; i++) for (unsigned int i = 0; i < 4; i++)
m_WiiMotes[i].DoState(p); m_WiiMotes[i].DoState(p);
// Reset the connection of real and hybrid wiimotes // Reset the connection of real and hybrid wiimotes
if (p.GetMode() == PointerWrap::MODE_READ && SConfig::GetInstance().m_WiimoteReconnectOnLoad) if (p.GetMode() == PointerWrap::MODE_READ && SConfig::GetInstance().m_WiimoteReconnectOnLoad)
{ {
for (unsigned int i = 0; i < 4; i++) for (unsigned int i = 0; i < 4; i++)
{ {
if (WIIMOTE_SRC_EMU == g_wiimote_sources[i] || WIIMOTE_SRC_NONE == g_wiimote_sources[i]) if (WIIMOTE_SRC_EMU == g_wiimote_sources[i] || WIIMOTE_SRC_NONE == g_wiimote_sources[i])
continue; continue;
// TODO: Selectively clear real wiimote messages if possible. Or create a real wiimote channel and reporting mode pre-setup to vacate the need for m_WiimoteReconnectOnLoad. // TODO: Selectively clear real wiimote messages if possible. Or create a real wiimote channel and reporting mode pre-setup to vacate the need for m_WiimoteReconnectOnLoad.
m_EventQueue.clear(); m_EventQueue.clear();
if (!m_WiiMotes[i].IsInactive()) if (!m_WiiMotes[i].IsInactive())
{ {
m_WiiMotes[i].Activate(false); m_WiiMotes[i].Activate(false);
m_WiiMotes[i].Activate(true); m_WiiMotes[i].Activate(true);
} }
else else
m_WiiMotes[i].Activate(false); m_WiiMotes[i].Activate(false);
} }
} }
} }

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

@ -365,8 +365,6 @@ CFrame::CFrame(wxFrame* parent,
// --------------- // ---------------
// Manager // Manager
// wxAUI_MGR_LIVE_RESIZE does not exist in the wxWidgets 2.8.9 that comes with Ubuntu 9.04
// Could just check for wxWidgets version if it becomes a problem.
m_Mgr = new wxAuiManager(this, wxAUI_MGR_DEFAULT | wxAUI_MGR_LIVE_RESIZE); m_Mgr = new wxAuiManager(this, wxAUI_MGR_DEFAULT | wxAUI_MGR_LIVE_RESIZE);
m_Mgr->AddPane(m_Panel, wxAuiPaneInfo() m_Mgr->AddPane(m_Panel, wxAuiPaneInfo()

5
Source/Core/DolphinWX/Src/FrameTools.cpp
View File

@ -1090,15 +1090,14 @@ void CFrame::DoStop()
Core::EState state = Core::GetState(); Core::EState state = Core::GetState();
confirmStop = true; confirmStop = true;
Core::SetState(Core::CORE_PAUSE); Core::SetState(Core::CORE_PAUSE);
wxMessageDialog *m_StopDlg = new wxMessageDialog( wxMessageDialog m_StopDlg(
this, this,
_("Do you want to stop the current emulation?"), _("Do you want to stop the current emulation?"),
_("Please confirm..."), _("Please confirm..."),
wxYES_NO | wxSTAY_ON_TOP | wxICON_EXCLAMATION, wxYES_NO | wxSTAY_ON_TOP | wxICON_EXCLAMATION,
wxDefaultPosition); wxDefaultPosition);
int Ret = m_StopDlg->ShowModal(); int Ret = m_StopDlg.ShowModal();
m_StopDlg->Destroy();
confirmStop = false; confirmStop = false;
if (Ret != wxID_YES) if (Ret != wxID_YES)
{ {