Merge pull request #10139 from malleoz/movie-mismatch-fix

Movie: display correct input difference on movie mismatch
This commit is contained in:
Scott Mansell 2021-09-30 15:34:10 +13:00 committed by GitHub
commit 40d9694bd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions

View File

@ -1072,8 +1072,7 @@ void LoadInput(const std::string& movie_path)
memcpy(&curPadState, &s_temp_input[frame * sizeof(ControllerState)], memcpy(&curPadState, &s_temp_input[frame * sizeof(ControllerState)],
sizeof(ControllerState)); sizeof(ControllerState));
ControllerState movPadState; ControllerState movPadState;
memcpy(&movPadState, &s_temp_input[frame * sizeof(ControllerState)], memcpy(&movPadState, &movInput[frame * sizeof(ControllerState)], sizeof(ControllerState));
sizeof(ControllerState));
PanicAlertFmtT( PanicAlertFmtT(
"Warning: You loaded a save whose movie mismatches on frame {0}. You should load " "Warning: You loaded a save whose movie mismatches on frame {0}. You should load "
"another save before continuing, or load this state with read-only mode off. " "another save before continuing, or load this state with read-only mode off. "