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 #802 from ChuckRozhon/gcpadstatus_change_char_cstdint 

Changed GCPadStatus struct to use cstdint types instead of char, short
This commit is contained in:
Lioncash 2014-08-14 17:03:27 -04:00
parent 64697abe48 97f68be70a
commit e6d10a069c
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,8 @@
#pragma once #pragma once
#include "Common/CommonTypes.h"
enum PadError enum PadError
{ {
PAD_ERR_NONE = 0, PAD_ERR_NONE = 0,
@ -35,16 +37,16 @@ enum PadButton
struct GCPadStatus struct GCPadStatus
{ {
unsigned short button; // Or-ed PAD_BUTTON_* and PAD_TRIGGER_* bits u16 button; // Or-ed PAD_BUTTON_* and PAD_TRIGGER_* bits
unsigned char stickX; // 0 <= stickX <= 255 u8 stickX; // 0 <= stickX <= 255
unsigned char stickY; // 0 <= stickY <= 255 u8 stickY; // 0 <= stickY <= 255
unsigned char substickX; // 0 <= substickX <= 255 u8 substickX; // 0 <= substickX <= 255
unsigned char substickY; // 0 <= substickY <= 255 u8 substickY; // 0 <= substickY <= 255
unsigned char triggerLeft; // 0 <= triggerLeft <= 255 u8 triggerLeft; // 0 <= triggerLeft <= 255
unsigned char triggerRight; // 0 <= triggerRight <= 255 u8 triggerRight; // 0 <= triggerRight <= 255
unsigned char analogA; // 0 <= analogA <= 255 u8 analogA; // 0 <= analogA <= 255
unsigned char analogB; // 0 <= analogB <= 255 u8 analogB; // 0 <= analogB <= 255
signed char err; // one of PAD_ERR_* number 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;