X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsdl.c;h=3afecaf918c2e7bd991e3ec36e335cad334a65b3;hp=c473b2652b4724b0176a2bef87b2605b97fe2e34;hb=25c22434b11938e230719d6f73df4ed7813570be;hpb=835e565490c1502920280c77eed9bb65fa932164 diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c index c473b265..3afecaf9 100644 --- a/src/libgame/sdl.c +++ b/src/libgame/sdl.c @@ -2847,7 +2847,7 @@ void SDLInitJoysticks() static boolean sdl_joystick_subsystem_initialized = FALSE; boolean print_warning = !sdl_joystick_subsystem_initialized; #if defined(TARGET_SDL2) - char *mappings_file_base = getPath2(options.ro_base_directory, + char *mappings_file_base = getPath2(options.conf_directory, GAMECONTROLLER_BASENAME); char *mappings_file_user = getPath2(getUserGameDataDir(), GAMECONTROLLER_BASENAME); @@ -2965,6 +2965,11 @@ boolean SDLReadJoystick(int nr, int *x, int *y, boolean *b1, boolean *b2) return TRUE; } + +/* ========================================================================= */ +/* touch input overlay functions */ +/* ========================================================================= */ + #if defined(USE_TOUCH_INPUT_OVERLAY) static void DrawTouchInputOverlay() {