X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_touch.pas;h=972c5422283f1c53f42d7ceb50097d7488661f14;hp=0638cc2713bfbfb432e484160ff431faa77adcbf;hb=4de34c0c003869d8f125768be330702020f3c514;hpb=a52956be369124d7373c9be299a7c8eb9aeef60d

diff --git a/src/game/g_touch.pas b/src/game/g_touch.pas
index 0638cc2..972c542 100644
--- a/src/game/g_touch.pas
+++ b/src/game/g_touch.pas
@@ -37,7 +37,7 @@ implementation
 
   uses
     SysUtils,
-    e_log, e_graphics, e_input, g_options, g_game, g_main, g_weapons, g_console;
+    e_log, e_graphics, e_input, g_options, g_game, g_main, g_gui, g_weapons, g_console;
 
   var
     angleFire: Boolean;
@@ -212,7 +212,7 @@ implementation
       g_Console_ProcessBind(i, False);
 
       (* up/down + fire hack *)
-      if g_touch_fire and (gGameSettings.GameType <> GT_NONE) and angleFire then
+      if g_touch_fire and (gGameSettings.GameType <> GT_NONE) and (g_ActiveWindow = nil) and angleFire then
       begin
         if (i = VK_UP) or (i = VK_DOWN) then
         begin
@@ -226,13 +226,12 @@ implementation
 
     procedure KeyDown (finger, i: Integer);
     begin
-      KeyPress(i); // Menu events
       keyFinger[i] := finger;
       e_KeyUpDown(i, True);
       g_Console_ProcessBind(i, True);
 
       (* up/down + fire hack *)
-      if g_touch_fire and (gGameSettings.GameType <> GT_NONE) then
+      if g_touch_fire and (gGameSettings.GameType <> GT_NONE) and (g_ActiveWindow = nil) then
       begin
         if i = VK_UP then
         begin