Merge pull request #3283 from RisingFog/patch-1

Fix Frame Advance Hold Delay Changes
This commit is contained in:
Matthew Parlane 2015-11-24 10:44:52 +13:00
commit f92a36d86c
1 changed files with 5 additions and 1 deletions

View File

@ -1568,12 +1568,16 @@ void CFrame::HandleFrameSkipHotkeys()
wxCommandEvent evt; wxCommandEvent evt;
evt.SetId(IDM_FRAMESTEP); evt.SetId(IDM_FRAMESTEP);
CFrame::OnFrameStep(evt); CFrame::OnFrameStep(evt);
if (holdFrameStepDelay > 0 && frameStepCount == 0) if (holdFrameStepDelay > 0)
holdFrameStep = true; holdFrameStep = true;
} }
if (frameStepCount < FRAME_STEP_DELAY) if (frameStepCount < FRAME_STEP_DELAY)
{
++frameStepCount; ++frameStepCount;
if (holdFrameStep)
holdFrameStep = false;
}
if (frameStepCount == FRAME_STEP_DELAY && holdFrameStep && holdFrameStepDelayCount >= holdFrameStepDelay) if (frameStepCount == FRAME_STEP_DELAY && holdFrameStep && holdFrameStepDelayCount >= holdFrameStepDelay)
{ {