X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_console.pas;h=20f7c8395ead0237e99d0a4f044176573021a570;hp=91131d1d91e75bba067c9927f5d86ea118de5ef7;hb=aa7e40301df69aa13c00ff2bcdb8e532b06b8053;hpb=17ca3896bbe664f64e6c302023b8010d4ebd02ff diff --git a/src/game/g_console.pas b/src/game/g_console.pas index 91131d1..20f7c83 100644 --- a/src/game/g_console.pas +++ b/src/game/g_console.pas @@ -100,8 +100,11 @@ var implementation uses + {$IFDEF ENABLE_MENU} + g_gui, g_menu, + {$ENDIF} {$IFNDEF HEADLESS} - g_gui, g_menu, g_touch, + g_touch, {$ENDIF} g_textures, e_input, g_game, g_gfx, g_player, g_items, SysUtils, g_basic, g_options, Math, e_res, @@ -154,6 +157,7 @@ var rep: Boolean; down, up: SSArray; end; + menu_toggled: BOOLEAN; (* hack for menu controls *) procedure g_Console_Switch; @@ -884,7 +888,9 @@ begin else if gChatShow then g_Console_Chat_Switch else + begin KeyPress(VK_ESCAPE); + end; menu_toggled := True end; 'toggleconsole': @@ -1768,7 +1774,7 @@ function BindsAllowed (key: Integer): Boolean; var grab, active: Boolean; begin Result := False; - {$IFDEF HEADLESS} + {$IFDEF DISABLE_MENU} grab := False; active := False; {$ELSE} @@ -1811,7 +1817,7 @@ end; procedure g_Console_ProcessBindRepeat (key: Integer); var i: Integer; active: Boolean; begin - {$IFDEF HEADLESS} + {$IFDEF DISABLE_MENU} active := False; {$ELSE} active := g_ActiveWindow <> nil;