Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #802 from ChuckRozhon/gcpadstatus_change_char_cstdint
Changed GCPadStatus struct to use cstdint types instead of char, short
  • Loading branch information
lioncash committed Aug 14, 2014
2 parents 64697ab + 97f68be commit e6d10a0
Showing 1 changed file with 12 additions and 10 deletions.
22 changes: 12 additions & 10 deletions Source/Core/InputCommon/GCPadStatus.h
Expand Up @@ -4,6 +4,8 @@

#pragma once

#include "Common/CommonTypes.h"

enum PadError
{
PAD_ERR_NONE = 0,
Expand Down Expand Up @@ -35,16 +37,16 @@ enum PadButton

struct GCPadStatus
{
unsigned short button; // Or-ed PAD_BUTTON_* and PAD_TRIGGER_* bits
unsigned char stickX; // 0 <= stickX <= 255
unsigned char stickY; // 0 <= stickY <= 255
unsigned char substickX; // 0 <= substickX <= 255
unsigned char substickY; // 0 <= substickY <= 255
unsigned char triggerLeft; // 0 <= triggerLeft <= 255
unsigned char triggerRight; // 0 <= triggerRight <= 255
unsigned char analogA; // 0 <= analogA <= 255
unsigned char analogB; // 0 <= analogB <= 255
signed char err; // one of PAD_ERR_* number
u16 button; // Or-ed PAD_BUTTON_* and PAD_TRIGGER_* bits
u8 stickX; // 0 <= stickX <= 255
u8 stickY; // 0 <= stickY <= 255
u8 substickX; // 0 <= substickX <= 255
u8 substickY; // 0 <= substickY <= 255
u8 triggerLeft; // 0 <= triggerLeft <= 255
u8 triggerRight; // 0 <= triggerRight <= 255
u8 analogA; // 0 <= analogA <= 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_Y = 0x80;
Expand Down

0 comments on commit e6d10a0

Please sign in to comment.