diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 5daed9b341abb7e029f41863d229117e35b1d23b..23113e77f629fd2b426ddc783bc1c31f0b30a33f 100644 (file)
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
g_Console_Switch()
end;
- IK_ESCAPE, VK_ESCAPE, JOY0_JUMP, JOY1_JUMP, JOY2_JUMP, JOY3_JUMP: // <Esc>:
+ IK_ESCAPE: // <Esc>:
+ begin
+ if gChatShow then
+ g_Console_Chat_Switch
+ else if gConsoleShow then
+ g_Console_Switch
+ end;
+
+ VK_ESCAPE: // <Esc>:
begin
if gChatShow then
begin
else if (g_ActiveWindow <> nil) then
begin
Msg.Msg := WM_KEYDOWN;
- Msg.WParam := IK_ESCAPE;
+ Msg.WParam := VK_ESCAPE;
g_ActiveWindow.OnMessage(Msg);
if (not g_Game_IsNet) and (g_ActiveWindow = nil) then g_Game_Pause(false); //Fn loves to do this
end