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

diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index ac24954..df6bba1 100644
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
@@ -32,18 +32,22 @@ var
   MapsDir: string;
   ModelsDir: string;
   GameWAD: string;
-
+  gSkipFirstChar: Boolean; (* hack for console/chat input *)
 
 implementation
 
 uses
-  SDL2, GL, GLExt, wadreader, e_log, g_window,
+{$INCLUDE ../nogl/noGLuses.inc}
+{$IFDEF ENABLE_HOLMES}
+  g_holmes, fui_wadread, fui_style, fui_gfx_gl,
+{$ENDIF}
+  SDL2, wadreader, e_log, g_window,
   e_graphics, e_input, g_game, g_console, g_gui,
-  e_sound, g_options, g_sound, g_player,
+  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_holmes,
-  utils, conbuf, envvars, fui_wadread, fui_style,
-  fui_gfx_gl, xparser;
+  g_menu, g_language, g_net, g_touch,
+  utils, conbuf, envvars,
+  xparser;
 
 
 var
@@ -52,7 +56,7 @@ var
 procedure Main();
 var
   sdlflags: LongWord;
-{$IFNDEF HEADLESS}
+{$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)}
   flexloaded: Boolean;
 {$ENDIF}
 begin
@@ -66,21 +70,21 @@ begin
 
   e_InitLog(GameDir + '/' + LOG_FILENAME, TWriteMode.WM_NEWFILE);
 
-  e_WriteLog('Read config file', TMsgType.Notify);
-  g_Options_Read(GameDir + '/' + CONFIG_FILENAME);
+  e_WriteLog(
+    'Doom 2D: Forever version ' + GAME_VERSION +
+    ' proto ' + IntToStr(NET_PROTOCOL_VER),
+    TMsgType.Notify
+  );
+  e_WriteLog(
+    'Build date: ' + GAME_BUILDDATE + ' ' + GAME_BUILDTIME,
+    TMsgType.Notify
+  );
 
 {$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;
@@ -97,14 +101,29 @@ begin
   sdlflags := SDL_INIT_JOYSTICK or SDL_INIT_TIMER or SDL_INIT_VIDEO;
  {$ENDIF}
 {$ENDIF}
+
+  SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, '0');
+
   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();
 {$ENDIF}
+{$ENDIF}
 
-{$IFNDEF HEADLESS}
+{$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)}
   flexloaded := true;
   if not fuiAddWad('flexui.wad') then
   begin
@@ -181,11 +200,14 @@ begin
 
   e_WriteLog('Init Input', TMsgType.Notify);
   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
@@ -474,12 +496,21 @@ begin
         if (g_ActiveWindow = nil) then g_Game_Pause(not gPause);
       end;
 
-    IK_BACKQUOTE: // <`/~/¨/¸>:
+    IK_BACKQUOTE, VK_CONSOLE: // <`/~/¨/¸>:
       begin
-        g_Console_Switch();
+        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
@@ -494,7 +525,7 @@ begin
         else 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
@@ -568,11 +599,12 @@ 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);
+    if gSkipFirstChar then
+      gSkipFirstChar := False
+    else
+      g_Console_Char(C)
   end
   else if (g_ActiveWindow <> nil) then
   begin