piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused GCPadStatus.err

Browse Source
This commit is contained in:
Michael Maltese
2017-02-09 14:49:20 -08:00
committed by Léo Lam
parent 80bcc0d58d
commit bb1c794657
3 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/HotkeyManager.cpp
View File

@ -174,8 +174,6 @@ InputConfig* GetConfig()
void GetStatus() void GetStatus()
{ {
s_hotkey.err = PAD_ERR_NONE;
// Get input // Get input
static_cast<HotkeyManager*>(s_config.GetController(0))->GetInput(&s_hotkey); static_cast<HotkeyManager*>(s_config.GetController(0))->GetInput(&s_hotkey);
} }

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

@ -1110,12 +1110,6 @@ void PlayController(GCPadStatus* PadStatus, int controllerID)
return; return;
} }
// dtm files don't save the mic button or error bit. not sure if they're actually used, but better
// safe than sorry
signed char e = PadStatus->err;
memset(PadStatus, 0, sizeof(GCPadStatus));
PadStatus->err = e;
memcpy(&s_padState, &s_temp_input[s_currentByte], sizeof(ControllerState)); memcpy(&s_padState, &s_temp_input[s_currentByte], sizeof(ControllerState));
s_currentByte += sizeof(ControllerState); s_currentByte += sizeof(ControllerState);

9
Source/Core/InputCommon/GCPadStatus.h
View File

@ -6,14 +6,6 @@
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
enum PadError
{
PAD_ERR_NONE = 0,
PAD_ERR_NO_CONTROLLER = -1,
PAD_ERR_NOT_READY = -2,
PAD_ERR_TRANSFER = -3,
};
enum enum
{ {
PAD_USE_ORIGIN = 0x0080, PAD_USE_ORIGIN = 0x0080,
@ -48,7 +40,6 @@ struct GCPadStatus
u8 triggerRight; // 0 <= triggerRight <= 255 u8 triggerRight; // 0 <= triggerRight <= 255
u8 analogA; // 0 <= analogA <= 255 u8 analogA; // 0 <= analogA <= 255
u8 analogB; // 0 <= analogB <= 255 u8 analogB; // 0 <= analogB <= 255
s8 err; // one of PAD_ERR_* number
static const u8 MAIN_STICK_CENTER_X = 0x80; static const u8 MAIN_STICK_CENTER_X = 0x80;
static const u8 MAIN_STICK_CENTER_Y = 0x80; static const u8 MAIN_STICK_CENTER_Y = 0x80;