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 #675 from lioncash/movie-params 

Core: Use param padState instead of a global in SetInputDisplayString
This commit is contained in:
Pierre Bourdon 2014-07-26 23:30:26 +02:00
parent 40273634a4 d1e487ae00
commit 957a39942e
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -531,32 +531,32 @@ static void SetInputDisplayString(ControllerState padState, int controllerID)
{
g_InputDisplay[controllerID] = StringFromFormat("P%d:", controllerID + 1);
if (g_padState.A)
if (padState.A)
g_InputDisplay[controllerID].append(" A");
if (g_padState.B)
if (padState.B)
g_InputDisplay[controllerID].append(" B");
if (g_padState.X)
if (padState.X)
g_InputDisplay[controllerID].append(" X");
if (g_padState.Y)
if (padState.Y)
g_InputDisplay[controllerID].append(" Y");
if (g_padState.Z)
if (padState.Z)
g_InputDisplay[controllerID].append(" Z");
if (g_padState.Start)
if (padState.Start)
g_InputDisplay[controllerID].append(" START");
if (g_padState.DPadUp)
if (padState.DPadUp)
g_InputDisplay[controllerID].append(" UP");
if (g_padState.DPadDown)
if (padState.DPadDown)
g_InputDisplay[controllerID].append(" DOWN");
if (g_padState.DPadLeft)
if (padState.DPadLeft)
g_InputDisplay[controllerID].append(" LEFT");
if (g_padState.DPadRight)
if (padState.DPadRight)
g_InputDisplay[controllerID].append(" RIGHT");
g_InputDisplay[controllerID].append(Analog1DToString(g_padState.TriggerL, " L"));
g_InputDisplay[controllerID].append(Analog1DToString(g_padState.TriggerR, " R"));
g_InputDisplay[controllerID].append(Analog2DToString(g_padState.AnalogStickX, g_padState.AnalogStickY, " ANA"));
g_InputDisplay[controllerID].append(Analog2DToString(g_padState.CStickX, g_padState.CStickY, " C"));
g_InputDisplay[controllerID].append(Analog1DToString(padState.TriggerL, " L"));
g_InputDisplay[controllerID].append(Analog1DToString(padState.TriggerR, " R"));
g_InputDisplay[controllerID].append(Analog2DToString(padState.AnalogStickX, padState.AnalogStickY, " ANA"));
g_InputDisplay[controllerID].append(Analog2DToString(padState.CStickX, padState.CStickY, " C"));
g_InputDisplay[controllerID].append("\n");
}