godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make num_buttons local, no need to keep in joystick struct

This commit is contained in:
hondres 2016-01-02 03:52:44 +01:00
parent 117ae93cf1
commit c60e1648ba
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
platform/x11/joystick_linux.cpp
View File

@ -45,11 +45,11 @@ static const char* ignore_str = "/dev/input/js";
joystick_linux::Joystick::Joystick() {
fd = -1;
dpad = 0;
dev = NULL;
devpath = "";
}
void joystick_linux::Joystick::reset() {
num_buttons = 0;
num_axes = 0;
dpad = 0;
fd = -1;
for (int i=0; i < MAX_ABS; i++) {
@ -225,20 +225,23 @@ static String _hex_str(uint8_t p_byte) {
void joystick_linux::setup_joystick_properties(int p_id) {
Joystick* joy = &joysticks[p_id];
libevdev* dev = joy->dev;
int num_buttons = 0;
int num_axes = 0;
for (int i = BTN_JOYSTICK; i < KEY_MAX; ++i) {
if (libevdev_has_event_code(dev, EV_KEY, i)) {
joy->key_map[i] = joy->num_buttons++;
joy->key_map[i] = num_buttons++;
}
}
for (int i = BTN_MISC; i < BTN_JOYSTICK; ++i) {
if (libevdev_has_event_code(dev, EV_KEY, i)) {
joy->key_map[i] = joy->num_buttons++;
joy->key_map[i] = num_buttons++;
}
}
for (int i = 0; i < ABS_MISC; ++i) {
@ -249,7 +252,7 @@ void joystick_linux::setup_joystick_properties(int p_id) {
}
if (libevdev_has_event_code(dev, EV_ABS, i)) {
joy->abs_map[i] = joy->num_axes++;
joy->abs_map[i] = num_axes++;
}
}
}

2
platform/x11/joystick_linux.h
View File

@ -56,8 +56,6 @@ private:
struct Joystick {
int key_map[MAX_KEY - BT_MISC];
int abs_map[MAX_ABS];
int num_buttons;
int num_axes;
int dpad;
int fd;