From 3c4e046609a245177be74b126d0ee78f22045356 Mon Sep 17 00:00:00 2001 From: Peter Tissen Date: Sun, 1 Jun 2014 11:35:57 +0200 Subject: [PATCH] make enum identifiers for all pad numbers, add a constant for the max number of pads and add string names for each identifier --- input/input_state.cpp | 11 ++++++++++- input/input_state.h | 12 ++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/input/input_state.cpp b/input/input_state.cpp index 2da6321b61..2761c6564d 100644 --- a/input/input_state.cpp +++ b/input/input_state.cpp @@ -6,7 +6,16 @@ const char *GetDeviceName(int deviceId) { switch (deviceId) { case DEVICE_ID_DEFAULT: return "built-in"; case DEVICE_ID_KEYBOARD: return "kbd"; - case DEVICE_ID_PAD_0: return "pad"; + case DEVICE_ID_PAD_0: return "pad1"; + case DEVICE_ID_PAD_1: return "pad2"; + case DEVICE_ID_PAD_2: return "pad3"; + case DEVICE_ID_PAD_3: return "pad4"; + case DEVICE_ID_PAD_4: return "pad5"; + case DEVICE_ID_PAD_5: return "pad6"; + case DEVICE_ID_PAD_6: return "pad7"; + case DEVICE_ID_PAD_7: return "pad8"; + case DEVICE_ID_PAD_8: return "pad9"; + case DEVICE_ID_PAD_9: return "pad10"; case DEVICE_ID_X360_0: return "x360"; case DEVICE_ID_ACCELEROMETER: return "accelerometer"; case DEVICE_ID_MOUSE: return "mouse"; diff --git a/input/input_state.h b/input/input_state.h index eb16a81bfa..c9fe43a91c 100644 --- a/input/input_state.h +++ b/input/input_state.h @@ -23,10 +23,22 @@ enum { DEVICE_ID_KEYBOARD = 1, // PC keyboard, android keyboards DEVICE_ID_MOUSE = 2, // PC mouse only (not touchscreen!) DEVICE_ID_PAD_0 = 10, // Generic joypads + DEVICE_ID_PAD_1 = 11, // these should stay as contiguous numbers + DEVICE_ID_PAD_2 = 12, + DEVICE_ID_PAD_3 = 13, + DEVICE_ID_PAD_4 = 14, + DEVICE_ID_PAD_5 = 15, + DEVICE_ID_PAD_6 = 16, + DEVICE_ID_PAD_7 = 17, + DEVICE_ID_PAD_8 = 18, + DEVICE_ID_PAD_9 = 19, DEVICE_ID_X360_0 = 20, // XInput joypads DEVICE_ID_ACCELEROMETER = 30, }; +//number of contiguous generic joypad IDs +const int MAX_NUM_PADS = 10; + const char *GetDeviceName(int deviceId); enum {