ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #521 from RisingFog/dtm-update 

Removed unused variable, Added tick count check
This commit is contained in:
Lioncash 2014-06-21 19:19:02 -04:00
parent d60f91ef5a 76c5fa084b
commit 72050d455d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Movie.cpp
View File

@ -937,7 +937,7 @@ void LoadInput(const std::string& filename)
static void CheckInputEnd() static void CheckInputEnd()
{ {
if (g_currentFrame > g_totalFrames || g_currentByte >= g_totalBytes) if (g_currentFrame > g_totalFrames || g_currentByte >= g_totalBytes || (CoreTiming::GetTicks() > g_totalTickCount && !IsRecordingInputFromSaveState()))
{ {
EndPlayInput(!g_bReadOnly); EndPlayInput(!g_bReadOnly);
} }

2
Source/Core/Core/Movie.h
View File

@ -64,7 +64,7 @@ extern u64 g_currentByte, g_totalBytes;
extern u64 g_currentFrame, g_totalFrames; extern u64 g_currentFrame, g_totalFrames;
extern u64 g_currentLagCount, g_totalLagCount; extern u64 g_currentLagCount, g_totalLagCount;
extern u64 g_currentInputCount, g_totalInputCount; extern u64 g_currentInputCount, g_totalInputCount;
extern u64 g_currentTickCount, g_totalTickCount, g_tickCountAtLastInput; extern u64 g_totalTickCount, g_tickCountAtLastInput;
extern std::string g_discChange; extern std::string g_discChange;
extern u32 g_rerecords; extern u32 g_rerecords;