fix chat/console input on android

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

diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index df6bba16a9b77160b30f6af2a3be2c61e0f8eae7..b5595832e9573dd1fd2242dbbf32af4085fce7ff 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
 
@@ -117,12 +116,6 @@ begin
   e_WriteLog(gLanguage, TMsgType.Notify);
   g_Language_Set(gLanguage);
 
-{$IFNDEF HEADLESS}
-{$IFNDEF ANDROID}
-  SDL_StartTextInput();
-{$ENDIF}
-{$ENDIF}
-
 {$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)}
   flexloaded := true;
   if not fuiAddWad('flexui.wad') then
@@ -174,10 +167,6 @@ begin
   SDLMain();
 {$WARNINGS ON}
 
-{$IFNDEF HEADLESS}
-  SDL_StopTextInput();
-{$ENDIF}
-
   e_WriteLog('Releasing SDL', TMsgType.Notify);
   SDL_Quit();
 end;
@@ -491,38 +480,9 @@ var
   Msg: g_gui.TMessage;
 begin
   case K of
-    IK_PAUSE: // <Pause/Break>:
-      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: // <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
-          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 := VK_ESCAPE;
@@ -601,10 +561,7 @@ var
 begin
   if gConsoleShow or gChatShow then
   begin
-    if gSkipFirstChar then
-      gSkipFirstChar := False
-    else
-      g_Console_Char(C)
+    g_Console_Char(C)
   end
   else if (g_ActiveWindow <> nil) then
   begin