X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fjoystick.c;h=0c61c57ad056bd75e16c4ec828504ce257e4a673;hb=76d9e113943e9f28f30dbb21ca2e8175ac5af560;hp=109ea9ea40a5e42c42151a1e76c3c9cc076b9bb0;hpb=115ce6f2da1914d68b0fe0e5f9082973190dacdd;p=rocksndiamonds.git diff --git a/src/libgame/joystick.c b/src/libgame/joystick.c index 109ea9ea..0c61c57a 100644 --- a/src/libgame/joystick.c +++ b/src/libgame/joystick.c @@ -4,7 +4,7 @@ // (c) 1995-2014 by Artsoft Entertainment // Holger Schemel // info@artsoft.org -// http://www.artsoft.org/ +// https://www.artsoft.org/ // ---------------------------------------------------------------------------- // joystick.c // ============================================================================ @@ -17,14 +17,14 @@ #include "misc.h" -/* ========================================================================= */ -/* platform independent joystick functions */ -/* ========================================================================= */ +// ============================================================================ +// platform independent joystick functions +// ============================================================================ #define TRANSLATE_JOYSYMBOL_TO_JOYNAME 0 #define TRANSLATE_JOYNAME_TO_JOYSYMBOL 1 -void translate_joyname(int *joysymbol, char **name, int mode) +static void translate_joyname(int *joysymbol, char **name, int mode) { static struct { @@ -249,7 +249,7 @@ int Joystick(int player_nr) return JoystickExt(player_nr, FALSE); } -int JoystickButtonExt(int player_nr, boolean use_as_joystick_nr) +static int JoystickButtonExt(int player_nr, boolean use_as_joystick_nr) { static int last_joy_button[MAX_PLAYERS] = { 0, 0, 0, 0 }; int joy_button = (JoystickExt(player_nr, use_as_joystick_nr) & JOY_BUTTON); @@ -320,7 +320,7 @@ void DeactivateJoystick(void) void ActivateJoystick(void) { - /* reactivate temporarily deactivated joystick */ + // reactivate temporarily deactivated joystick if (joystick.status & JOYSTICK_AVAILABLE) joystick.status |= JOYSTICK_ACTIVE;