diff --git a/d1x-rebirth/arch/include/joy.h b/common/include/joy.h similarity index 100% rename from d1x-rebirth/arch/include/joy.h rename to common/include/joy.h diff --git a/d2x-rebirth/arch/include/joy.h b/d2x-rebirth/arch/include/joy.h deleted file mode 100644 index b69293ea9..000000000 --- a/d2x-rebirth/arch/include/joy.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * - * Header for joystick functions - * - */ - -#ifndef _JOY_H -#define _JOY_H - -#include "pstypes.h" -#include "fix.h" -#include - -struct d_event; - -#define MAX_JOYSTICKS 8 -#define MAX_AXES_PER_JOYSTICK 128 -#define MAX_BUTTONS_PER_JOYSTICK 128 -#define MAX_HATS_PER_JOYSTICK 4 -#define JOY_MAX_AXES (MAX_AXES_PER_JOYSTICK * MAX_JOYSTICKS) -#define JOY_MAX_BUTTONS (MAX_BUTTONS_PER_JOYSTICK * MAX_JOYSTICKS) - -extern int joy_num_axes; // set to Joystick.n_axes. solve different? -extern void joy_init(); -extern void joy_close(); -extern void event_joystick_get_axis(struct d_event *event, int *axis, int *value); -extern void joy_flush(); -extern int event_joystick_get_button(struct d_event *event); -extern void joy_button_handler(SDL_JoyButtonEvent *jbe); -extern void joy_hat_handler(SDL_JoyHatEvent *jhe); -extern int joy_axis_handler(SDL_JoyAxisEvent *jae); - -#endif // _JOY_H