piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-31 01:59:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4088 from RisingFog/remove_globals_movie

Browse Source 
Remove Global Declarations from Movie
This commit is contained in:
Mat M
2016-08-05 10:42:58 -04:00
committed by GitHub
parent 8f04396dc3 222c4ba077
commit fa5a2474f4
10 changed files with 137 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -1294,7 +1294,7 @@ void CFrame::OnStop(wxCommandEvent& WXUNUSED(event))
void CFrame::OnReset(wxCommandEvent& WXUNUSED(event))
{
if (Movie::IsRecordingInput())
Movie::g_bReset = true;
Movie::SetReset(true);
ProcessorInterface::ResetButton_Tap();
}

6
Source/Core/DolphinWX/TASInputDlg.cpp
View File

@ -1106,11 +1106,11 @@ void TASInputDlg::SetTurbo(wxMouseEvent& event)
// NOTE: Host / CPU Thread
void TASInputDlg::ButtonTurbo()
{
static u64 frame = Movie::g_currentFrame;
static u64 frame = Movie::GetCurrentFrame();
if (frame != Movie::g_currentFrame)
if (frame != Movie::GetCurrentFrame())
{
frame = Movie::g_currentFrame;
frame = Movie::GetCurrentFrame();
for (Button* const button : m_buttons)
{
if (button != nullptr && button->turbo_on)