X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_main.pas;h=ccad27b86c8e700b0b8ecaa43ff0f4d00d7a44b3;hb=7ab0e3623e342566a036b71b847b629e26ee56e1;hp=874907ed63c9598bfe9a9b214617787588b3cb8e;hpb=3a2594735abd86e583b35da46526b9d16a9cd0ed;p=d2df-sdl.git

diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 874907e..ccad27b 100644
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
@@ -32,16 +32,12 @@ var
   MapsDir: string;
   ModelsDir: string;
   GameWAD: string;
-
+  gSkipFirstChar: Boolean; (* hack for console/chat input *)
 
 implementation
 
 uses
-{$IFDEF USE_NANOGL}
-  nanoGL,
-{$ELSE}
-  GL, GLExt,
-{$ENDIF}
+{$INCLUDE ../nogl/noGLuses.inc}
 {$IFDEF ENABLE_HOLMES}
   g_holmes, fui_wadread, fui_style, fui_gfx_gl,
 {$ENDIF}
@@ -60,7 +56,7 @@ var
 procedure Main();
 var
   sdlflags: LongWord;
-{$IFNDEF HEADLESS}
+{$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)}
   flexloaded: Boolean;
 {$ENDIF}
 begin
@@ -84,21 +80,11 @@ begin
     TMsgType.Notify
   );
 
-  e_WriteLog('Read config file', TMsgType.Notify);
-  g_Options_Read(GameDir + '/' + CONFIG_FILENAME);
-
 {$IFDEF HEADLESS}
   conbufDumpToStdOut := true;
 {$ENDIF}
   e_WriteToStdOut := False; //{$IFDEF HEADLESS}True;{$ELSE}False;{$ENDIF}
 
-  //GetSystemDefaultLCID()
-
-  //e_WriteLog('Read language file', MSG_NOTIFY);
-  //g_Language_Load(DataDir + gLanguage + '.txt');
-  e_WriteLog(gLanguage, TMsgType.Notify);
-  g_Language_Set(gLanguage);
-
 {$IFDEF HEADLESS}
  {$IFDEF USE_SDLMIXER}
   sdlflags := SDL_INIT_TIMER or SDL_INIT_AUDIO or $00004000;
@@ -121,6 +107,16 @@ begin
   if SDL_Init(sdlflags) < 0 then
     raise Exception.Create('SDL: Init failed: ' + SDL_GetError());
 
+  e_WriteLog('Read config file', TMsgType.Notify);
+  g_Options_Read(GameDir + '/' + CONFIG_FILENAME);
+
+  //GetSystemDefaultLCID()
+
+  //e_WriteLog('Read language file', MSG_NOTIFY);
+  //g_Language_Load(DataDir + gLanguage + '.txt');
+  e_WriteLog(gLanguage, TMsgType.Notify);
+  g_Language_Set(gLanguage);
+
 {$IFNDEF HEADLESS}
 {$IFNDEF ANDROID}
   SDL_StartTextInput();
@@ -500,7 +496,8 @@ begin
 
     IK_BACKQUOTE, VK_CONSOLE: // <`/~/¨/¸>:
       begin
-        g_Console_Switch();
+        if not gChatShow then
+          g_Console_Switch()
       end;
 
     IK_ESCAPE, VK_ESCAPE: // <Esc>:
@@ -592,6 +589,12 @@ 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