summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5eaf38a)
raw | patch | inline | side by side (parent: 5eaf38a)
author | DeaDDooMER <deaddoomer@deadsoftware.ru> | |
Sun, 4 Aug 2019 14:38:50 +0000 (17:38 +0300) | ||
committer | DeaDDooMER <deaddoomer@deadsoftware.ru> | |
Sun, 4 Aug 2019 14:38:50 +0000 (17:38 +0300) |
src/game/g_console.pas | patch | blob | history |
diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index 11170326ca66b02c8f09a200297df5e7e6263e86..63454eb1cb52dbf1ad6b6014a971926559679f5b 100644 (file)
--- a/src/game/g_console.pas
+++ b/src/game/g_console.pas
Result := g_Console_MatchBind(key, 'togglemenu') or
g_Console_MatchBind(key, 'showkeyboard') or
g_Console_MatchBind(key, 'hidekeyboard')
- else if (gGameSettings.GameType <> GT_NONE) and not gConsoleShow then
- Result := True
- else (* if CONSOLE or MENU then *)
+ else if gConsoleShow or (g_ActiveWindow <> nil) or (gGameSettings.GameType = GT_NONE) then
Result := g_Console_MatchBind(key, 'togglemenu') or
g_Console_MatchBind(key, 'toggleconsole') or
g_Console_MatchBind(key, 'showkeyboard') or
g_Console_MatchBind(key, 'hidekeyboard')
+ else (* in game *)
+ Result := True
end
end;