X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_game.pas;h=1923452907701501d2b724eddef191b6aeb3028e;hb=271f8f040cb0bd53be1ee6f682a346101f578491;hp=80fb0531df35051f2b53f7eef73719392ca9460d;hpb=3424d00c1df01d4ccef05c7436345e61c16c22ff;p=d2df-sdl.git diff --git a/src/game/g_game.pas b/src/game/g_game.pas index 80fb053..1923452 100644 --- a/src/game/g_game.pas +++ b/src/game/g_game.pas @@ -1695,23 +1695,25 @@ begin begin if g_ActiveWindow = nil then begin - if e_KeyPressed(gGameControls.GameControls.Chat) then + if e_KeyPressed(gGameControls.GameControls.Chat) or e_KeyPressed(VK_CHAT) then g_Console_Chat_Switch(False) - else if (e_KeyPressed(gGameControls.GameControls.TeamChat)) and + else if (e_KeyPressed(gGameControls.GameControls.TeamChat) or e_KeyPressed(VK_TEAM)) and (gGameSettings.GameMode in [GM_TDM, GM_CTF]) then g_Console_Chat_Switch(True); end; end else if not gChatEnter then if (not e_KeyPressed(gGameControls.GameControls.Chat)) - and (not e_KeyPressed(gGameControls.GameControls.TeamChat)) then + and (not e_KeyPressed(gGameControls.GameControls.TeamChat)) + and (not e_KeyPressed(VK_CHAT)) + and (not e_KeyPressed(VK_TEAM)) then gChatEnter := True; // Ñòàòèñòèêà ïî Tab: if gGameOn then IsDrawStat := (not gConsoleShow) and (not gChatShow) and (gGameSettings.GameType <> GT_SINGLE) and - e_KeyPressed(gGameControls.GameControls.Stat); + (e_KeyPressed(gGameControls.GameControls.Stat) or e_KeyPressed(VK_STATUS)); // Èãðà èäåò: if gGameOn and not gPause and (gState <> STATE_FOLD) then @@ -2011,7 +2013,7 @@ begin end; // Äåëàåì ñêðèíøîò (íå ÷àùå 200 ìèëëèñåêóíä): - if e_KeyPressed(gGameControls.GameControls.TakeScreenshot) then + if e_KeyPressed(gGameControls.GameControls.TakeScreenshot) or e_KeyPressed(VK_PRINTSCR) then if (GetTimer()-LastScreenShot) > 200000 div 1000 then begin g_TakeScreenShot();