Skip to content
Permalink
Browse files

Merge pull request #8155 from Techjar/dtm-get-origin

Core/Movie: Store PAD_GET_ORIGIN bit in ControllerState
  • Loading branch information...
leoetlino committed Jun 14, 2019
2 parents e2d59ab + 5f3bf40 commit 3b7a7ae2e7a6686bc3e8e2537a8a8cd65daf0e95
Showing with 7 additions and 1 deletion.
  1. +6 −0 Source/Core/Core/Movie.cpp
  2. +1 −1 Source/Core/Core/Movie.h
@@ -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

0 comments on commit 3b7a7ae

Please sign in to comment.
You can’t perform that action at this time.