X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fsdl2%2Fg_touch.pas;h=645176010962aafa8b105f8389d3116f3cf3660b;hb=aa7e40301df69aa13c00ff2bcdb8e532b06b8053;hp=3f999ed551d03babf7c615b457c774f810d1b605;hpb=e452d337f0620b50d8d978b534437b2732134d8f;p=d2df-sdl.git diff --git a/src/game/sdl2/g_touch.pas b/src/game/sdl2/g_touch.pas index 3f999ed..6451760 100644 --- a/src/game/sdl2/g_touch.pas +++ b/src/game/sdl2/g_touch.pas @@ -35,8 +35,12 @@ interface implementation uses + {$IFDEF ENABLE_MENU} + g_gui, + {$ENDIF} SysUtils, - e_log, e_graphics, e_input, g_options, g_game, g_main, g_gui, g_weapons, g_console, g_window; + e_log, r_graphics, r_game, e_input, g_options, g_game, g_weapons, g_console + ; var angleFire: Boolean; @@ -219,7 +223,11 @@ implementation g_Console_ProcessBind(i, False); (* up/down + fire hack *) +{$IFDEF ENABLE_MENU} if g_touch_fire and (gGameSettings.GameType <> GT_NONE) and (g_ActiveWindow = nil) and angleFire then +{$ELSE} + if g_touch_fire and (gGameSettings.GameType <> GT_NONE) and angleFire then +{$ENDIF} begin if (i = VK_UP) or (i = VK_DOWN) then begin @@ -241,7 +249,11 @@ implementation g_Console_ProcessBind(i, True); (* up/down + fire hack *) +{$IFDEF ENABLE_MENU} if g_touch_fire and (gGameSettings.GameType <> GT_NONE) and (g_ActiveWindow = nil) then +{$ELSE} + if g_touch_fire and (gGameSettings.GameType <> GT_NONE) then +{$ENDIF} begin if i = VK_UP then begin