Reserved key range for virtual keyboard + alternative virtkbd layout

[d2df-sdl.git] / src / game / g_main.pas

diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 12f33c6940fd05a7bff33ced7fb4bc58aff1d8d7..07d2f48007b52a75ccd1c7b3befae8dac45b1708 100644 (file)
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
@@ -37,9 +37,14 @@ var
 implementation
 
 uses
-  SDL2, GL, GLExt, wadreader, e_log, g_window,
+{$IFDEF USE_NANOGL}
+  nanoGL,
+{$ELSE}
+  GL, GLExt,
+{$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,
@@ -66,6 +71,16 @@ begin
 
   e_InitLog(GameDir + '/' + LOG_FILENAME, TWriteMode.WM_NEWFILE);
 
+  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
+  );
+
   e_WriteLog('Read config file', TMsgType.Notify);
   g_Options_Read(GameDir + '/' + CONFIG_FILENAME);
 
@@ -91,7 +106,8 @@ begin
  {$ENDIF}
 {$ELSE}
  {$IFDEF USE_SDLMIXER}
-  sdlflags := SDL_INIT_EVERYTHING;
+  {*sdlflags := SDL_INIT_EVERYTHING;*}
+  sdlflags := SDL_INIT_JOYSTICK or SDL_INIT_TIMER or SDL_INIT_VIDEO;
  {$ELSE}
   sdlflags := SDL_INIT_JOYSTICK or SDL_INIT_TIMER or SDL_INIT_VIDEO;
  {$ENDIF}
@@ -100,8 +116,10 @@ begin
     raise Exception.Create('SDL: Init failed: ' + SDL_GetError());
 
 {$IFNDEF HEADLESS}
+{$IFNDEF ANDROID}
   SDL_StartTextInput();
 {$ENDIF}
+{$ENDIF}
 
 {$IFNDEF HEADLESS}
   flexloaded := true;
@@ -473,12 +491,12 @@ begin
         if (g_ActiveWindow = nil) then g_Game_Pause(not gPause);
       end;
 
-    IK_BACKQUOTE: // <`/~/¨/¸>:
+    IK_BACKQUOTE, VK_CONSOLE: // <`/~/¨/¸>:
       begin
         g_Console_Switch();
       end;
 
-    IK_ESCAPE: // <Esc>:
+    IK_ESCAPE, VK_ESCAPE: // <Esc>:
       begin
         if gChatShow then
         begin