Merge pull request #8155 from Techjar/dtm-get-origin
Core/Movie: Store PAD_GET_ORIGIN bit in ControllerState
This commit is contained in:
commit
3b7a7ae2e7
|
@ -804,6 +804,8 @@ void CheckPadStatus(const GCPadStatus* PadStatus, int controllerID)
|
|||
|
||||
s_padState.is_connected = PadStatus->isConnected;
|
||||
|
||||
s_padState.get_origin = (PadStatus->button & PAD_GET_ORIGIN) != 0;
|
||||
|
||||
s_padState.disc = s_bDiscChange;
|
||||
s_bDiscChange = false;
|
||||
s_padState.reset = s_bReset;
|
||||
|
@ -1183,6 +1185,10 @@ void PlayController(GCPadStatus* PadStatus, int controllerID)
|
|||
PadStatus->button |= PAD_TRIGGER_L;
|
||||
if (s_padState.R)
|
||||
PadStatus->button |= PAD_TRIGGER_R;
|
||||
|
||||
if (s_padState.get_origin)
|
||||
PadStatus->button |= PAD_GET_ORIGIN;
|
||||
|
||||
if (s_padState.disc)
|
||||
{
|
||||
Core::RunAsCPUThread([] {
|
||||
|
|
|
@ -49,7 +49,7 @@ struct ControllerState
|
|||
bool disc : 1; // Checks for disc being changed
|
||||
bool reset : 1; // Console reset button
|
||||
bool is_connected : 1; // Should controller be treated as connected
|
||||
bool reserved : 1; // Reserved bits used for padding, 1 bit
|
||||
bool get_origin : 1; // Special bit to indicate analog origin reset
|
||||
|
||||
u8 TriggerL, TriggerR; // Triggers, 16 bits
|
||||
u8 AnalogStickX, AnalogStickY; // Main Stick, 16 bits
|
||||
|
|
Loading…
Reference in New Issue