X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flibgame%2Fsdl.c;h=1184acd84a4b227af94424e920b8b201bdb42344;hb=f73405762b7a66ebed17c0f6fa56e909d7e5626f;hp=e13b6736e32999aec9e2574c7d3da7780dffe59c;hpb=e617cc94b68c43105fc3c06d26d31c9bc99161a4;p=rocksndiamonds.git diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c index e13b6736..1184acd8 100644 --- a/src/libgame/sdl.c +++ b/src/libgame/sdl.c @@ -14,6 +14,7 @@ #include "joystick.h" #include "misc.h" #include "setup.h" +#include "gadgets.h" #define ENABLE_UNUSED_CODE 0 // currently unused functions @@ -39,6 +40,7 @@ void sge_Line(SDL_Surface *, Sint16, Sint16, Sint16, Sint16, Uint32); #if defined(USE_TOUCH_INPUT_OVERLAY) // functions to draw overlay graphics for touch device input static void DrawTouchInputOverlay(void); +static void DrawTouchGadgetsOverlay(void); #endif void SDLLimitScreenUpdates(boolean enable) @@ -212,6 +214,9 @@ static void UpdateScreenExt(SDL_Rect *rect, boolean with_frame_delay) #if defined(USE_TOUCH_INPUT_OVERLAY) // draw overlay graphics for touch device input, if needed DrawTouchInputOverlay(); + + // draw overlay gadgets for touch device input, if needed + DrawTouchGadgetsOverlay(); #endif // global synchronization point of the game to align video frame delay @@ -2829,7 +2834,10 @@ static void DrawTouchInputOverlay_ShowGridButtons(int alpha) continue; if (grid_button == overlay.grid_button_highlight) - alpha_draw = alpha_highlight; + { + draw_outlined = FALSE; + alpha_draw = MIN((float)alpha_highlight * 1.5, SDL_ALPHA_OPAQUE); + } if (draw_pressed && overlay.grid_button_action & grid_button_action) { @@ -2945,4 +2953,9 @@ static void DrawTouchInputOverlay(void) DrawTouchInputOverlay_ShowGridButtons(alpha); } + +static void DrawTouchGadgetsOverlay(void) +{ + DrawGadgets_OverlayTouchButtons(); +} #endif