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

diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index df6bba1..c3741bc 100644
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
@@ -32,7 +32,7 @@ var
   MapsDir: string;
   ModelsDir: string;
   GameWAD: string;
-  gSkipFirstChar: Boolean; (* hack for console/chat input *)
+  LogFileName: string;
 
 implementation
 
@@ -68,7 +68,7 @@ begin
   ModelsDir := DataDir + 'models/';
   GameWAD := DataDir + 'Game.wad';
 
-  e_InitLog(GameDir + '/' + LOG_FILENAME, TWriteMode.WM_NEWFILE);
+  e_InitLog(GameDir + '/' + LogFileName, TWriteMode.WM_NEWFILE);
 
   e_WriteLog(
     'Doom 2D: Forever version ' + GAME_VERSION +
@@ -117,12 +117,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 +168,6 @@ begin
   SDLMain();
 {$WARNINGS ON}
 
-{$IFNDEF HEADLESS}
-  SDL_StopTextInput();
-{$ENDIF}
-
   e_WriteLog('Releasing SDL', TMsgType.Notify);
   SDL_Quit();
 end;
@@ -487,42 +477,16 @@ end;
 
 
 procedure KeyPress (K: Word);
+{$IFNDEF HEADLESS}
 var
   Msg: g_gui.TMessage;
+{$ENDIF}
 begin
+{$IFNDEF HEADLESS}
   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;
@@ -591,6 +555,7 @@ begin
         end;
       end;
   end;
+{$ENDIF}
 end;
 
 
@@ -601,10 +566,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