X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_main.pas;h=e73bf6eaf9eee515958700d8d754d283903c8e0e;hb=987c4a835a103345b59937e8e1be8524a6228712;hp=bb394f1d1b94761447c373d1b45335462118c574;hpb=1e27a158ab2d7b1041d932308b6f39aa3e22655f;p=d2df-sdl.git

diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index bb394f1..e73bf6e 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;
-
+  LogFileName: string;
 
 implementation
 
@@ -56,7 +55,7 @@ var
 procedure Main();
 var
   sdlflags: LongWord;
-{$IFNDEF HEADLESS}
+{$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)}
   flexloaded: Boolean;
 {$ENDIF}
 begin
@@ -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
@@ -174,10 +167,6 @@ begin
   SDLMain();
 {$WARNINGS ON}
 
-{$IFNDEF HEADLESS}
-  SDL_StopTextInput();
-{$ENDIF}
-
   e_WriteLog('Releasing SDL', TMsgType.Notify);
   SDL_Quit();
 end;
@@ -202,10 +191,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
@@ -485,36 +476,19 @@ end;
 
 
 procedure KeyPress (K: Word);
+{$IFNDEF HEADLESS}
 var
   Msg: g_gui.TMessage;
+{$ENDIF}
 begin
+{$IFNDEF HEADLESS}
   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
-        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
@@ -580,6 +554,7 @@ begin
         end;
       end;
   end;
+{$ENDIF}
 end;
 
 
@@ -588,11 +563,9 @@ var
   Msg: g_gui.TMessage;
   a: Integer;
 begin
-  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