Removed unused variable, Added tick count check #521
Merged
+2
−2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
nvm this is no good for moviies that start from save state. |
|
LGTM |
|
@dolphin-emu-bot rebuild |
| @@ -937,7 +937,7 @@ void LoadInput(const std::string& filename) | |||
|
|
|||
| 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())) | |||
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
lioncash
added a commit
that referenced
this pull request
Jun 21, 2014
Removed unused variable, Added tick count check
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Checks if current tick count is over the reported tick count, stops movie playback if it is.