diff options
| author | rog <rdragoon@optonline.net> | 2012-10-24 23:21:34 -0400 |
|---|---|---|
| committer | rog <rdragoon@optonline.net> | 2012-10-24 23:21:34 -0400 |
| commit | 8dfb12da3e130eccb348c030c247dac2de27a58d (patch) | |
| tree | 82273ece113fa730c475269c21d9aa963b7ef3a1 /Source/Core | |
| parent | 76a6917fdf244854bba1e3c989fc1b306173d06f (diff) | |
stuff
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/Movie.cpp | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 53b5e2a088..ba4201f8f3 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -105,6 +105,13 @@ void FrameUpdate() g_totalFrames = g_currentFrame; g_totalLagCount = g_currentLagCount; } + if (IsPlayingInput() && IsConfigSaved()) + { + if (IsConfigSaved()) + { + SetGraphicsConfig(); + } + } if (g_bFrameStep) { @@ -149,6 +156,7 @@ void Init() memset(&g_padState, 0, sizeof(g_padState)); if (!tmpHeader.bFromSaveState || !IsPlayingInput()) Core::SetStateFileName(""); + for (int i = 0; i < 8; ++i) g_InputDisplay[i].clear(); @@ -388,6 +396,7 @@ bool BeginRecordingInput(int controllers) } g_playMode = MODE_RECORDING; GetSettings(); + bSaveConfig = true; delete [] tmpInput; tmpInput = new u8[MAX_DTM_LENGTH]; @@ -475,15 +484,6 @@ void SetInputDisplayString(ControllerState padState, int controllerID) if(g_padState.DPadRight) g_InputDisplay[controllerID].append(" RIGHT"); - //if(g_padState.L) - //{ - // g_InputDisplay[controllerID].append(" L"); - //} - //if(g_padState.R) - //{ - // g_InputDisplay[controllerID].append(" R"); - //} - Analog1DToString(g_padState.TriggerL, " L", inp); g_InputDisplay[controllerID].append(inp); @@ -550,8 +550,6 @@ void SetWiiInputDisplayString(int remoteID, u8* const coreData, u8* const accelD g_InputDisplay[controllerID].append("\n"); } - - void RecordInput(SPADStatus *PadStatus, int controllerID) { if(!IsRecordingInput() || !IsUsingPad(controllerID)) @@ -872,10 +870,6 @@ void PlayController(SPADStatus *PadStatus, int controllerID) if (!IsPlayingInput() || !IsUsingPad(controllerID) || tmpInput == NULL) return; - if (IsConfigSaved()) - { - SetGraphicsConfig(); - } if (g_currentFrame == 1) { if (tmpHeader.bMemcard) |