Merge pull request #1390 from RachelBryk/turbo

Alternate inputs once per frame rather than once per input for turbo.
This commit is contained in:
skidau 2014-10-27 12:56:21 +11:00
commit bf97e7f9c1

View File

@ -23,6 +23,7 @@
#include <wx/windowid.h> #include <wx/windowid.h>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/Movie.h"
#include "Core/HW/WiimoteEmu/MatrixMath.h" #include "Core/HW/WiimoteEmu/MatrixMath.h"
#include "DolphinWX/TASInputDlg.h" #include "DolphinWX/TASInputDlg.h"
#include "InputCommon/GCPadStatus.h" #include "InputCommon/GCPadStatus.h"
@ -745,10 +746,16 @@ void TASInputDlg::SetTurbo(wxMouseEvent& event)
void TASInputDlg::ButtonTurbo() void TASInputDlg::ButtonTurbo()
{ {
for (unsigned int i = 0; i < 14; ++i) static u64 frame = Movie::g_currentFrame;
if (frame != Movie::g_currentFrame)
{ {
if (m_buttons[i] != nullptr && m_buttons[i]->turbo_on) frame = Movie::g_currentFrame;
m_buttons[i]->checkbox->SetValue(!m_buttons[i]->checkbox->GetValue()); for (unsigned int i = 0; i < 14; ++i)
{
if (m_buttons[i] != nullptr && m_buttons[i]->turbo_on)
m_buttons[i]->checkbox->SetValue(!m_buttons[i]->checkbox->GetValue());
}
} }
} }