OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-24 19:31:04 +00:00
Code Issues Projects Releases Wiki Activity

Use Service::HID::PadState instead of internal states

Browse Source
This commit is contained in:
Daniel Stuart Baxter 2015-05-24 22:53:11 -05:00
parent f1039f8b05
commit 2547423835
2 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/input_common/controller_state.h
View File

@ -5,32 +5,16 @@
#pragma once #pragma once
#include "common/common_types.h" #include "common/common_types.h"
#include "core/hle/service/hid/hid.h"
namespace InputCommon { namespace InputCommon {
enum ControllerButtons {
A = 0,
B,
X,
Y,
L,
R,
ZL,
ZR,
START,
SELECT,
HOME,
DPAD_LEFT,
DPAD_RIGHT,
DPAD_UP,
DPAD_DOWN
};
struct ControllerState { struct ControllerState {
bool buttons[15]; Service::HID::PadState jpad_state;
s16 circle_pad_x; s16 circle_pad_x;
s16 circle_pad_y; s16 circle_pad_y;
u16 touch_screen_x; u16 touch_screen_x;
u16 touch_screen_y; u16 touch_screen_y;
}; };
} //namespace } //namespace

3
src/input_common/input_common.h
View File

@ -6,7 +6,6 @@
#include "common/common_types.h" #include "common/common_types.h"
#include "controller_state.h" #include "controller_state.h"
#include "core/hle/service/hid/hid.h"
namespace InputCommon { namespace InputCommon {
@ -32,7 +31,7 @@ public:
private: private:
///Internal view this specific object will have of 3DS input states, NOT the same as Service::HID::PadState! ///Internal view this specific object will have of 3DS input states
ControllerState controller_state; ControllerState controller_state;
///Internal name of currently selected device ///Internal name of currently selected device