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

stuff

This commit is contained in:
rog 2012-10-24 23:21:34 -04:00
parent 76a6917fdf
commit 8dfb12da3e
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Core/Core/Src/Movie.cpp
View File

@ -105,6 +105,13 @@ void FrameUpdate()
g_totalFrames = g_currentFrame; g_totalFrames = g_currentFrame;
g_totalLagCount = g_currentLagCount; g_totalLagCount = g_currentLagCount;
} }
if (IsPlayingInput() && IsConfigSaved())
{
if (IsConfigSaved())
{
SetGraphicsConfig();
}
}
if (g_bFrameStep) if (g_bFrameStep)
{ {
@ -149,6 +156,7 @@ void Init()
memset(&g_padState, 0, sizeof(g_padState)); memset(&g_padState, 0, sizeof(g_padState));
if (!tmpHeader.bFromSaveState || !IsPlayingInput()) if (!tmpHeader.bFromSaveState || !IsPlayingInput())
Core::SetStateFileName(""); Core::SetStateFileName("");
for (int i = 0; i < 8; ++i) for (int i = 0; i < 8; ++i)
g_InputDisplay[i].clear(); g_InputDisplay[i].clear();
@ -388,6 +396,7 @@ bool BeginRecordingInput(int controllers)
} }
g_playMode = MODE_RECORDING; g_playMode = MODE_RECORDING;
GetSettings(); GetSettings();
bSaveConfig = true;
delete [] tmpInput; delete [] tmpInput;
tmpInput = new u8[MAX_DTM_LENGTH]; tmpInput = new u8[MAX_DTM_LENGTH];
@ -475,15 +484,6 @@ void SetInputDisplayString(ControllerState padState, int controllerID)
if(g_padState.DPadRight) if(g_padState.DPadRight)
g_InputDisplay[controllerID].append(" RIGHT"); 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); Analog1DToString(g_padState.TriggerL, " L", inp);
g_InputDisplay[controllerID].append(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"); g_InputDisplay[controllerID].append("\n");
} }
void RecordInput(SPADStatus *PadStatus, int controllerID) void RecordInput(SPADStatus *PadStatus, int controllerID)
{ {
if(!IsRecordingInput() || !IsUsingPad(controllerID)) if(!IsRecordingInput() || !IsUsingPad(controllerID))
@ -872,10 +870,6 @@ void PlayController(SPADStatus *PadStatus, int controllerID)
if (!IsPlayingInput() || !IsUsingPad(controllerID) || tmpInput == NULL) if (!IsPlayingInput() || !IsUsingPad(controllerID) || tmpInput == NULL)
return; return;
if (IsConfigSaved())
{
SetGraphicsConfig();
}
if (g_currentFrame == 1) if (g_currentFrame == 1)
{ {
if (tmpHeader.bMemcard) if (tmpHeader.bMemcard)