X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_main.pas;h=5ea72be400acb2a56f9809a70217175121492ddc;hb=a07765f3e726f5efff9fbaff0ac8917b0924c3ac;hp=23113e77f629fd2b426ddc783bc1c31f0b30a33f;hpb=4de34c0c003869d8f125768be330702020f3c514;p=d2df-sdl.git

diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 23113e7..5ea72be 100644
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
@@ -2,8 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -32,7 +31,7 @@ var
   MapsDir: string;
   ModelsDir: string;
   GameWAD: string;
-  gSkipFirstChar: Boolean; (* hack for console/chat input *)
+  LogFileName: string;
 
 implementation
 
@@ -45,7 +44,7 @@ uses
   e_graphics, e_input, g_game, g_console, g_gui,
   e_sound, g_options, g_sound, g_player, g_basic,
   g_weapons, SysUtils, g_triggers, MAPDEF, g_map,
-  g_menu, g_language, g_net, g_touch,
+  g_menu, g_language, g_net, g_touch, g_res_downloader,
   utils, conbuf, envvars,
   xparser;
 
@@ -68,7 +67,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 +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
@@ -168,16 +161,14 @@ begin
   g_holmes_imfunctional := not flexloaded;
 {$ENDIF}
 
+  g_Res_CreateDatabases();
+
   e_WriteLog('Entering SDLMain', TMsgType.Notify);
 
 {$WARNINGS OFF}
   SDLMain();
 {$WARNINGS ON}
 
-{$IFNDEF HEADLESS}
-  SDL_StopTextInput();
-{$ENDIF}
-
   e_WriteLog('Releasing SDL', TMsgType.Notify);
   SDL_Quit();
 end;
@@ -487,42 +478,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 +556,7 @@ begin
         end;
       end;
   end;
+{$ENDIF}
 end;
 
 
@@ -599,17 +565,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