X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_main.pas;h=df6bba16a9b77160b30f6af2a3be2c61e0f8eae7;hb=78dc38833a49bf6225f221d9a0f179adc6acd007;hp=ccad27b86c8e700b0b8ecaa43ff0f4d00d7a44b3;hpb=7ab0e3623e342566a036b71b847b629e26ee56e1;p=d2df-sdl.git

diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index ccad27b..df6bba1 100644
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
@@ -202,10 +202,12 @@ begin
   e_InitInput();
   g_Touch_Init;
 
+(*
   if (e_JoysticksAvailable > 0) then
     e_WriteLog('Input: Joysticks available.', TMsgType.Notify)
   else
     e_WriteLog('Input: No Joysticks.', TMsgType.Notify);
+*)
 
   if (not gNoSound) then
   begin
@@ -500,7 +502,15 @@ begin
           g_Console_Switch()
       end;
 
-    IK_ESCAPE, VK_ESCAPE: // <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
@@ -515,7 +525,7 @@ 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
@@ -589,17 +599,12 @@ var
   Msg: g_gui.TMessage;
   a: Integer;
 begin
-  if gSkipFirstChar then
-  begin
-    gSkipFirstChar := False;
-    Exit
-  end;
-
-  if (not gChatShow) and ((C = '`') or (C = '~') or (C = '¸') or (C = '¨')) then Exit;
-
   if gConsoleShow or gChatShow then
   begin
-    g_Console_Char(C);
+    if gSkipFirstChar then
+      gSkipFirstChar := False
+    else
+      g_Console_Char(C)
   end
   else if (g_ActiveWindow <> nil) then
   begin