fixed input when open console

[d2df-sdl.git] / src / game / g_main.pas

diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index ccad27b86c8e700b0b8ecaa43ff0f4d00d7a44b3..86c5f843a0cdc5c7db7aeb8e79573d6e3a48496d 100644 (file)
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
@@ -32,7 +32,6 @@ var
   MapsDir: string;
   ModelsDir: string;
   GameWAD: string;
-  gSkipFirstChar: Boolean; (* hack for console/chat input *)
 
 implementation
 
@@ -202,10 +201,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
@@ -489,33 +490,12 @@ var
   Msg: g_gui.TMessage;
 begin
   case K of
-    IK_PAUSE: // <Pause/Break>:
+    VK_ESCAPE: // <Esc>:
       begin
-        if (g_ActiveWindow = nil) then g_Game_Pause(not gPause);
-      end;
-
-    IK_BACKQUOTE, VK_CONSOLE: // <`/~/¨/¸>:
-      begin
-        if not gChatShow then
-          g_Console_Switch()
-      end;
-
-    IK_ESCAPE, VK_ESCAPE: // <Esc>:
-      begin
-        if gChatShow then
-        begin
-          g_Console_Chat_Switch();
-          Exit;
-        end;
-
-        if gConsoleShow then
-        begin
-          g_Console_Switch();
-        end
-        else if (g_ActiveWindow <> nil) then
+        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 +569,9 @@ 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);
+    g_Console_Char(C)
   end
   else if (g_ActiveWindow <> nil) then
   begin