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

Movie/Frame: Amend variable naming

Browse Source 
Amends variable naming related to translation unit locals and TAS input
dialogs that were modified in the previous commit.
This commit is contained in:
Lioncash
2017-04-02 04:11:58 -04:00
parent 7f0203a5b0
commit 678905764a
4 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/DolphinWX/Frame.cpp
+3 -3
View File
@@ -502,15 +502,15 @@ void CFrame::BindEvents()
void CFrame::InitializeTASDialogs()
{
for (int i = 0; i < 8; ++i)
g_TASInputDlg[i] = new TASInputDlg(this);
m_tas_input_dialogs[i] = new TASInputDlg(this);
Movie::SetGCInputManip([this](GCPadStatus* pad_status, int controller_id) {
g_TASInputDlg[controller_id]->GetValues(pad_status);
m_tas_input_dialogs[controller_id]->GetValues(pad_status);
});
Movie::SetWiiInputManip([this](u8* data, WiimoteEmu::ReportFeatures rptf, int controller_id,
int ext, wiimote_key key) {
g_TASInputDlg[controller_id + 4]->GetValues(data, rptf, ext, key);
m_tas_input_dialogs[controller_id + 4]->GetValues(data, rptf, ext, key);
});
}
Source/Core/DolphinWX/Frame.h
+1 -1
View File
@@ -137,7 +137,7 @@ private:
CLogWindow* m_LogWindow = nullptr;
LogConfigWindow* m_LogConfigWindow = nullptr;
FifoPlayerDlg* m_FifoPlayerDlg = nullptr;
TASInputDlg* g_TASInputDlg[8];
TASInputDlg* m_tas_input_dialogs[8];
bool UseDebugger = false;
bool m_bBatchMode = false;
bool m_bEdit = false;
Source/Core/DolphinWX/FrameTools.cpp
+7 -6
View File
@@ -369,17 +369,18 @@ void CFrame::OnTASInput(wxCommandEvent& event)
if (SConfig::GetInstance().m_SIDevice[i] != SerialInterface::SIDEVICE_NONE &&
SConfig::GetInstance().m_SIDevice[i] != SerialInterface::SIDEVICE_GC_GBA)
{
g_TASInputDlg[i]->CreateGCLayout();
g_TASInputDlg[i]->Show();
g_TASInputDlg[i]->SetTitle(wxString::Format(_("TAS Input - GameCube Controller %d"), i + 1));
m_tas_input_dialogs[i]->CreateGCLayout();
m_tas_input_dialogs[i]->Show();
m_tas_input_dialogs[i]->SetTitle(
wxString::Format(_("TAS Input - GameCube Controller %d"), i + 1));
}
if (g_wiimote_sources[i] == WIIMOTE_SRC_EMU &&
!(Core::IsRunning() && !SConfig::GetInstance().bWii))
{
g_TASInputDlg[i + 4]->CreateWiiLayout(i);
g_TASInputDlg[i + 4]->Show();
g_TASInputDlg[i + 4]->SetTitle(wxString::Format(_("TAS Input - Wii Remote %d"), i + 1));
m_tas_input_dialogs[i + 4]->CreateWiiLayout(i);
m_tas_input_dialogs[i + 4]->Show();
m_tas_input_dialogs[i + 4]->SetTitle(wxString::Format(_("TAS Input - Wii Remote %d"), i + 1));
}
}
}