Yaya48/dolphin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #411 from lioncash/fifo-cleanup

Browse Source 
Make GetBPRegInfo just take two strings as parameters
This commit is contained in:
Pierre Bourdon
2014-05-30 01:51:11 +02:00
parent 7c09f07f36 c96407bd2a
commit 3097345929
3 changed files with 91 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/DolphinWX/FifoPlayerDlg.cpp
+8 -6
View File
@@ -789,16 +789,18 @@ void FifoPlayerDlg::OnObjectCmdListSelectionChanged(wxCommandEvent& event)
wxString newLabel;
if (*cmddata == GX_LOAD_BP_REG)
{
char name[64]="\0", desc[512]="\0";
GetBPRegInfo(cmddata+1, name, sizeof(name), desc, sizeof(desc));
std::string name;
std::string desc;
GetBPRegInfo(cmddata+1, &name, &desc);
newLabel = _("BP register ");
newLabel += (name[0] != '\0') ? StrToWxStr(name) : wxString::Format(_("UNKNOWN_%02X"), *(cmddata+1));
newLabel += (name.empty()) ? wxString::Format(_("UNKNOWN_%02X"), *(cmddata+1)) : StrToWxStr(name);
newLabel += ":\n";
if (desc[0] != '\0')
newLabel += StrToWxStr(desc);
else
if (desc.empty())
newLabel += _("No description available");
else
newLabel += StrToWxStr(desc);
}
else if (*cmddata == GX_LOAD_CP_REG)
{