cleanup: move init and main loop code from g_window

diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index bbbcdd3089eeacf26c5e688d19b377a3e1b76990..74354e0ea4fe5bed8ea7a24ef93164ab1c37ea75 100644 (file)
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
@@ -200,7 +200,8 @@ uses
   fui_ctls in '../flexui/fui_ctls.pas',
 {$ENDIF}
   {$I ../shared/vampimg.inc}
-  SysUtils;
+
+  SysUtils, Classes;
 
 {$IFDEF WINDOWS}
   {$R *.res}
@@ -211,6 +212,275 @@ uses
     binPath: AnsiString = '';
     forceBinDir: Boolean = False;
 
+    wLoadingQuit: Boolean = false;
+    Time, Time_Delta, Time_Old: Int64;
+    Frame: Int64;
+    flag: Boolean = false;
+
+procedure Update ();
+begin
+  // remember old mobj positions, prepare for update
+  g_Game_PreUpdate();
+  // server: receive client commands for new frame
+  // client: receive game state changes from server
+       if (NetMode = NET_SERVER) then g_Net_Host_Update()
+  else if (NetMode = NET_CLIENT) then g_Net_Client_Update();
+  // think
+  g_Game_Update();
+  // server: send any accumulated outgoing data to clients
+  if NetMode = NET_SERVER then g_Net_Flush();
+end;
+
+procedure Init();
+var
+  NoSound: Boolean;
+begin
+  Randomize;
+
+{$IFDEF HEADLESS}
+ {$IFDEF USE_SDLMIXER}
+  NoSound := False; // hope env has set SDL_AUDIODRIVER to dummy
+ {$ELSE}
+  NoSound := True; // FMOD backend will sort it out
+ {$ENDIF}
+{$ELSE}
+  NoSound := False;
+{$ENDIF}
+
+  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
+    e_WriteLog('Initializing sound system', TMsgType.Notify);
+    e_InitSoundSystem(NoSound);
+  end;
+
+  e_WriteLog('Init game', TMsgType.Notify);
+  g_Game_Init();
+
+//  FillChar(charbuff, sizeof(charbuff), ' ');
+end;
+
+procedure Release();
+begin
+  e_WriteLog('Releasing engine', TMsgType.Notify);
+  e_ReleaseEngine();
+
+  e_WriteLog('Releasing input', TMsgType.Notify);
+  e_ReleaseInput();
+
+  if not gNoSound then
+  begin
+    e_WriteLog('Releasing sound', TMsgType.Notify);
+    e_ReleaseSoundSystem();
+  end;
+end;
+
+function ProcessMessage (): Boolean;
+var
+  i, t: Integer;
+begin
+  result := sys_HandleInput();
+
+  Time := sys_GetTicks();
+  Time_Delta := Time-Time_Old;
+
+  flag := false;
+
+  if wNeedTimeReset then
+  begin
+    Frame := 0;
+    Time_Delta := 28;
+    wNeedTimeReset := false;
+  end;
+
+  g_Map_ProfilersBegin();
+  g_Mons_ProfilersBegin();
+
+  t := Time_Delta div 28;
+  if (t > 0) then
+  begin
+    flag := true;
+    for i := 1 to t do
+      Update();
+  end;
+
+  g_Map_ProfilersEnd();
+  g_Mons_ProfilersEnd();
+
+  if wLoadingQuit then
+  begin
+    g_Game_Free();
+    g_Game_Quit();
+  end;
+
+  if (gExit = EXIT_QUIT) then
+  begin
+    result := true;
+    exit;
+  end;
+
+  // Время предыдущего обновления
+  if flag then
+    Time_Old := Time - (Time_Delta mod 28);
+
+  // don't wait if VSync is on, GL already probably waits enough
+  if gLerpActors then
+    flag := (Time - Frame >= gFrameTime) or gVSync;
+
+  if flag then
+  begin
+    if gPause or (not gLerpActors) or (gState = STATE_FOLD) then
+      gLerpFactor := 1.0
+    else
+      gLerpFactor := nmin(1.0, (Time - Time_Old) / 28.0);
+    r_Game_Draw;
+    sys_Repaint;
+    Frame := Time
+  end
+  else
+    sys_Delay(1);
+
+  e_SoundUpdate();
+end;
+
+
+function SDLMain (): Integer;
+var
+  idx: Integer;
+  arg: AnsiString;
+  mdfo: TStream;
+  {$IFDEF ENABLE_HOLMES}
+  itmp: Integer;
+  valres: Word;
+  {$ENDIF}
+begin
+
+  idx := 1;
+  while (idx <= ParamCount) do
+  begin
+    arg := ParamStr(idx);
+    Inc(idx);
+    //if arg = '--twinkletwinkle' then gwin_k8_enable_light_experiments := true;
+    if arg = '--jah' then g_profile_history_size := 100;
+    if arg = '--no-particles' then gpart_dbg_enabled := false;
+    if arg = '--no-los' then gmon_dbg_los_enabled := false;
+
+    if arg = '--profile-render' then g_profile_frame_draw := true;
+    if arg = '--profile-coldet' then g_profile_collision := true;
+    if arg = '--profile-los' then g_profile_los := true;
+
+    if arg = '--no-part-phys' then gpart_dbg_phys_enabled := false;
+    if arg = '--no-part-physics' then gpart_dbg_phys_enabled := false;
+    if arg = '--no-particles-phys' then gpart_dbg_phys_enabled := false;
+    if arg = '--no-particles-physics' then gpart_dbg_phys_enabled := false;
+    if arg = '--no-particle-phys' then gpart_dbg_phys_enabled := false;
+    if arg = '--no-particle-physics' then gpart_dbg_phys_enabled := false;
+
+    if arg = '--debug-input' then g_dbg_input := True;
+
+    {.$IF DEFINED(D2F_DEBUG)}
+    if arg = '--aimline' then g_dbg_aimline_on := true;
+    {.$ENDIF}
+
+{$IFDEF ENABLE_HOLMES}
+    if arg = '--holmes' then begin g_holmes_enabled := true; g_Game_SetDebugMode(); end;
+
+    if (arg = '--holmes-ui-scale') or (arg = '-holmes-ui-scale') then
+    begin
+      if (idx <= ParamCount) then
+      begin
+        if not conParseFloat(fuiRenderScale, ParamStr(idx)) then fuiRenderScale := 1.0;
+        Inc(idx);
+      end;
+    end;
+
+    if (arg = '--holmes-font') or (arg = '-holmes-font') then
+    begin
+      if (idx <= ParamCount) then
+      begin
+        itmp := 0;
+        val(ParamStr(idx), itmp, valres);
+        {$IFNDEF HEADLESS}
+        if (valres = 0) and (not g_holmes_imfunctional) then
+        begin
+          case itmp of
+            8: uiContext.font := 'win8';
+            14: uiContext.font := 'win14';
+            16: uiContext.font := 'win16';
+          end;
+        end;
+        {$ELSE}
+        // fuck off, fpc!
+        itmp := itmp;
+        valres := valres;
+        {$ENDIF}
+        Inc(idx);
+      end;
+    end;
+{$ENDIF}
+
+    if (arg = '--game-scale') or (arg = '-game-scale') then
+    begin
+      if (idx <= ParamCount) then
+      begin
+        if not conParseFloat(g_dbg_scale, ParamStr(idx)) then g_dbg_scale := 1.0;
+        Inc(idx);
+      end;
+    end;
+
+    if (arg = '--write-mapdef') or (arg = '-write-mapdef') then
+    begin
+      mdfo := createDiskFile('mapdef.txt');
+      mdfo.WriteBuffer(defaultMapDef[1], Length(defaultMapDef));
+      mdfo.Free();
+      Halt(0);
+    end;
+
+    if (arg = '--pixel-scale') or (arg = '-pixel-scale') then
+    begin
+      if (idx <= ParamCount) then
+      begin
+        if not conParseFloat(r_pixel_scale, ParamStr(idx)) then r_pixel_scale := 1.0;
+        Inc(idx);
+      end;
+    end;
+  end;
+
+  r_Window_Initialize;
+
+  Init;
+  Time_Old := sys_GetTicks();
+
+  g_Net_InitLowLevel();
+
+  // game commad line
+  if (ParamCount > 0) then g_Game_Process_Params();
+
+{$IFNDEF HEADLESS}
+  if (not gGameOn) and gAskLanguage then g_Menu_AskLanguage();
+{$ENDIF}
+
+  e_WriteLog('Entering the main loop', TMsgType.Notify);
+
+  // main loop
+  while not ProcessMessage() do begin end;
+
+  g_Net_Slist_ShutdownAll();
+
+  Release();
+
+  g_Net_DeinitLowLevel();
+  result := 0;
+end;
+
 function GetBinaryPath (): AnsiString;
   {$IFDEF LINUX}
     var sl: AnsiString;

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 9095b1d4ab6de440e131a4fbfd1aaf2ffb2c90b5..f7aed54523e41c6a4f133426fdd73404165a2746 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
@@ -375,6 +375,7 @@ var
   g_rlayer_water: Boolean = true;
   g_rlayer_fore: Boolean = true;
 
+  wNeedTimeReset: Boolean = false;
 
 procedure g_ResetDynlights ();
 procedure g_AddDynLight (x, y, radius: Integer; r, g, b, a: Single);
@@ -3542,7 +3543,7 @@ begin
       gGameOn := True;
 
       DisableCheats();
-      ResetTimer();
+      wNeedTimeReset := True;
 
       if gGameSettings.GameMode = GM_CTF then
       begin

diff --git a/src/game/g_holmes.pas b/src/game/g_holmes.pas
index 7f74dc18f600bfd8e24343f0a1d98797560c9c61..e21faf5d8ffac4227e00fc4654e2cfd381d9fd3c 100644 (file)
--- a/src/game/g_holmes.pas
+++ b/src/game/g_holmes.pas
@@ -21,7 +21,7 @@ uses
   mempool, geom,
   e_log, e_input,
   g_textures, g_basic, r_graphics, g_phys, g_grid, g_player, g_monsters,
-  g_window, g_map, g_triggers, g_items, g_game, g_panel, g_console, g_gfx,
+  g_map, g_triggers, g_items, g_game, g_panel, g_console, g_gfx,
   xprofiler,
   sdlcarcass,
   fui_common, fui_events, fui_ctls,

diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index 265bade66424b2a0412cac54634581691f123a91..4d20921eee5eb0797cfb7134f6ac43004e850e74 100644 (file)
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
@@ -43,7 +43,7 @@ var
 implementation
 
 uses
-  g_gui, g_textures, r_graphics, g_window, g_game, g_map,
+  g_gui, g_textures, r_graphics, g_game, g_map,
   g_base, g_basic, g_console, g_sound, g_gfx, g_player, g_options, g_weapons,
   e_log, SysUtils, CONFIG, g_playermodel, DateUtils,
   MAPDEF, Math, g_saveload,

diff --git a/src/game/g_netmaster.pas b/src/game/g_netmaster.pas
index fb2729b52140edaa31de46eeae41285450032d01..f4b5618b20448ce2f44ea517f82db2af52096885 100644 (file)
--- a/src/game/g_netmaster.pas
+++ b/src/game/g_netmaster.pas
@@ -176,7 +176,7 @@ function GetTimerMS (): Int64;
 implementation
 
 uses
-  e_input, e_log, g_window, g_net, g_console,
+  e_input, e_log, g_net, g_console,
   g_map, g_game, g_sound, g_gui, g_menu, g_options, g_language, g_basic, r_game,
   wadreader, g_system, utils, hashtable;
 

diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index f1f0653493f8ba86a2b3c107d89c75871090f0fd..836f06d68fb25113e8e994bcd269d823a191ed59 100644 (file)
--- a/src/game/g_options.pas
+++ b/src/game/g_options.pas
@@ -86,6 +86,11 @@ var
   g_dbg_scale: Single = 1.0;
   r_pixel_scale: Single = 1.0;
 
+  gwin_has_stencil: Boolean = false;
+  gwin_k8_enable_light_experiments: Boolean = false;
+  g_dbg_aimline_on: Boolean = false;
+  g_dbg_input: Boolean = False;
+
   {--- Read-only dirs ---}
   GameWAD: string;
   DataDirs: SSArray;
@@ -114,7 +119,7 @@ uses
   {$IFDEF USE_SDL2}
     SDL2,
   {$ENDIF}
-  e_log, e_input, g_console, g_window, g_sound, g_gfx, g_player, Math,
+  e_log, e_input, g_console, g_sound, g_gfx, g_player, Math,
   g_map, g_net, g_netmaster, SysUtils, CONFIG, g_game,
   g_items, wadreader, g_touch, envvars, g_system;
 
@@ -397,4 +402,6 @@ initialization
   conRegVar('g_save_stats', @gSaveStats, '', '');
   conRegVar('g_screenshot_stats', @gScreenshotStats, '', '');
   conRegVar('g_lastmap', @gsMap, '', '');
+
+  conRegVar('d_input', @g_dbg_input, '', '')
 end.

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index dab24aed016a61ee69982a742f4aac794d9b6e17..9e410bfd95016f1df3d25c7ef1191127eede250c 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@ -638,7 +638,7 @@ uses
   e_log, g_map, g_items, g_console, g_gfx, Math,
   g_options, g_triggers, g_menu, g_game, g_grid, e_res,
   wadreader, g_monsters, CONFIG, g_language,
-  g_net, g_netmsg, g_window,
+  g_net, g_netmsg,
   utils, xstreams;
 
 const PLR_SAVE_VERSION = 0;

diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index bfd4377830c271bc278fe5480357782093cec5f7..5b62d6310563997644e74682509c81e3497edcc5 100644 (file)
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
@@ -17,335 +17,25 @@ unit g_window;
 
 interface
 
-uses
-  utils;
-
-function SDLMain (): Integer;
-procedure ResetTimer ();
-procedure ProcessLoading (forceUpdate: Boolean=false);
-
-var
-  gwin_has_stencil: Boolean = false;
-  gwin_k8_enable_light_experiments: Boolean = false;
-  g_dbg_aimline_on: Boolean = false;
-  g_dbg_input: Boolean = False;
+  procedure ProcessLoading (forceUpdate: Boolean=false);
 
 implementation
 
-uses
-{$IFDEF WINDOWS}Windows,{$ENDIF}
-{$IFDEF ENABLE_HOLMES}
-  g_holmes, sdlcarcass, fui_ctls,
-{$ENDIF}
-  SysUtils, Classes, MAPDEF, Math, r_graphics,
-  r_window, e_log, r_game,
-  g_console, r_console, e_input, g_options, g_game,
-  g_basic, g_textures, e_sound, g_sound, g_menu, ENet, g_net,
-  g_map, g_gfx, g_monsters, xprofiler,
-  g_touch, g_gui, g_system, g_netmaster;
-
-var
-  Time, Time_Delta, Time_Old: Int64;
-  Frame: Int64;
-  flag: Boolean;
-  wNeedTimeReset: Boolean = false;
-  wLoadingQuit: Boolean = false;
-
-procedure Update ();
-begin
-  // remember old mobj positions, prepare for update
-  g_Game_PreUpdate();
-  // server: receive client commands for new frame
-  // client: receive game state changes from server
-       if (NetMode = NET_SERVER) then g_Net_Host_Update()
-  else if (NetMode = NET_CLIENT) then g_Net_Client_Update();
-  // think
-  g_Game_Update();
-  // server: send any accumulated outgoing data to clients
-  if NetMode = NET_SERVER then g_Net_Flush();
-end;
-
-
-procedure Draw ();
-begin
-  r_Game_Draw();
-end;
-
-
-procedure Init();
-var
-  NoSound: Boolean;
-begin
-  Randomize;
-
-{$IFDEF HEADLESS}
- {$IFDEF USE_SDLMIXER}
-  NoSound := False; // hope env has set SDL_AUDIODRIVER to dummy
- {$ELSE}
-  NoSound := True; // FMOD backend will sort it out
- {$ENDIF}
-{$ELSE}
-  NoSound := False;
-{$ENDIF}
-
-  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
-    e_WriteLog('Initializing sound system', TMsgType.Notify);
-    e_InitSoundSystem(NoSound);
-  end;
-
-  e_WriteLog('Init game', TMsgType.Notify);
-  g_Game_Init();
-
-//  FillChar(charbuff, sizeof(charbuff), ' ');
-end;
-
-procedure Release();
-begin
-  e_WriteLog('Releasing engine', TMsgType.Notify);
-  e_ReleaseEngine();
-
-  e_WriteLog('Releasing input', TMsgType.Notify);
-  e_ReleaseInput();
-
-  if not gNoSound then
-  begin
-    e_WriteLog('Releasing sound', TMsgType.Notify);
-    e_ReleaseSoundSystem();
-  end;
-end;
-
-procedure ResetTimer ();
-begin
-  wNeedTimeReset := true;
-end;
-
-procedure ProcessLoading (forceUpdate: Boolean=false);
-begin
-  if sys_HandleInput() = True then
-    Exit;
-
-{$IFNDEF HEADLESS}
-  r_Window_DrawLoading(forceUpdate);
-{$ENDIF}
-
-  e_SoundUpdate();
-
-  if NetMode = NET_SERVER then
-    g_Net_Host_Update()
-  else if (NetMode = NET_CLIENT) and (NetState <> NET_STATE_AUTH) then
-    g_Net_Client_UpdateWhileLoading();
-end;
-
-
-function ProcessMessage (): Boolean;
-var
-  i, t: Integer;
-begin
-  result := sys_HandleInput();
-
-  Time := sys_GetTicks();
-  Time_Delta := Time-Time_Old;
-
-  flag := false;
-
-  if wNeedTimeReset then
-  begin
-    Frame := 0;
-    Time_Delta := 28;
-    wNeedTimeReset := false;
-  end;
-
-  g_Map_ProfilersBegin();
-  g_Mons_ProfilersBegin();
-
-  t := Time_Delta div 28;
-  if (t > 0) then
-  begin
-    flag := true;
-    for i := 1 to t do
-      Update();
-  end;
-
-  g_Map_ProfilersEnd();
-  g_Mons_ProfilersEnd();
+  uses e_sound, g_system, g_net, r_window;
 
-  if wLoadingQuit then
+  procedure ProcessLoading (forceUpdate: Boolean = False);
   begin
-    g_Game_Free();
-    g_Game_Quit();
-  end;
-
-  if (gExit = EXIT_QUIT) then
-  begin
-    result := true;
-    exit;
-  end;
-
-  // Âðåìÿ ïðåäûäóùåãî îáíîâëåíèÿ
-  if flag then
-    Time_Old := Time - (Time_Delta mod 28);
-
-  // don't wait if VSync is on, GL already probably waits enough
-  if gLerpActors then
-    flag := (Time - Frame >= gFrameTime) or gVSync;
-
-  if flag then
-  begin
-    if gPause or (not gLerpActors) or (gState = STATE_FOLD) then
-      gLerpFactor := 1.0
-    else
-      gLerpFactor := nmin(1.0, (Time - Time_Old) / 28.0);
-    Draw;
-    sys_Repaint;
-    Frame := Time
-  end
-  else
-    sys_Delay(1);
-
-  e_SoundUpdate();
-end;
-
-function SDLMain (): Integer;
-var
-  idx: Integer;
-  arg: AnsiString;
-  mdfo: TStream;
-  {$IFDEF ENABLE_HOLMES}
-  itmp: Integer;
-  valres: Word;
-  {$ENDIF}
-begin
-
-  idx := 1;
-  while (idx <= ParamCount) do
-  begin
-    arg := ParamStr(idx);
-    Inc(idx);
-    //if arg = '--twinkletwinkle' then gwin_k8_enable_light_experiments := true;
-    if arg = '--jah' then g_profile_history_size := 100;
-    if arg = '--no-particles' then gpart_dbg_enabled := false;
-    if arg = '--no-los' then gmon_dbg_los_enabled := false;
-
-    if arg = '--profile-render' then g_profile_frame_draw := true;
-    if arg = '--profile-coldet' then g_profile_collision := true;
-    if arg = '--profile-los' then g_profile_los := true;
-
-    if arg = '--no-part-phys' then gpart_dbg_phys_enabled := false;
-    if arg = '--no-part-physics' then gpart_dbg_phys_enabled := false;
-    if arg = '--no-particles-phys' then gpart_dbg_phys_enabled := false;
-    if arg = '--no-particles-physics' then gpart_dbg_phys_enabled := false;
-    if arg = '--no-particle-phys' then gpart_dbg_phys_enabled := false;
-    if arg = '--no-particle-physics' then gpart_dbg_phys_enabled := false;
-
-    if arg = '--debug-input' then g_dbg_input := True;
-
-    {.$IF DEFINED(D2F_DEBUG)}
-    if arg = '--aimline' then g_dbg_aimline_on := true;
-    {.$ENDIF}
-
-{$IFDEF ENABLE_HOLMES}
-    if arg = '--holmes' then begin g_holmes_enabled := true; g_Game_SetDebugMode(); end;
-
-    if (arg = '--holmes-ui-scale') or (arg = '-holmes-ui-scale') then
+    if sys_HandleInput() = False then
     begin
-      if (idx <= ParamCount) then
-      begin
-        if not conParseFloat(fuiRenderScale, ParamStr(idx)) then fuiRenderScale := 1.0;
-        Inc(idx);
-      end;
-    end;
-
-    if (arg = '--holmes-font') or (arg = '-holmes-font') then
-    begin
-      if (idx <= ParamCount) then
-      begin
-        itmp := 0;
-        val(ParamStr(idx), itmp, valres);
-        {$IFNDEF HEADLESS}
-        if (valres = 0) and (not g_holmes_imfunctional) then
-        begin
-          case itmp of
-            8: uiContext.font := 'win8';
-            14: uiContext.font := 'win14';
-            16: uiContext.font := 'win16';
-          end;
-        end;
-        {$ELSE}
-        // fuck off, fpc!
-        itmp := itmp;
-        valres := valres;
-        {$ENDIF}
-        Inc(idx);
-      end;
-    end;
-{$ENDIF}
-
-    if (arg = '--game-scale') or (arg = '-game-scale') then
-    begin
-      if (idx <= ParamCount) then
-      begin
-        if not conParseFloat(g_dbg_scale, ParamStr(idx)) then g_dbg_scale := 1.0;
-        Inc(idx);
-      end;
-    end;
-
-    if (arg = '--write-mapdef') or (arg = '-write-mapdef') then
-    begin
-      mdfo := createDiskFile('mapdef.txt');
-      mdfo.WriteBuffer(defaultMapDef[1], Length(defaultMapDef));
-      mdfo.Free();
-      Halt(0);
-    end;
-
-    if (arg = '--pixel-scale') or (arg = '-pixel-scale') then
-    begin
-      if (idx <= ParamCount) then
-      begin
-        if not conParseFloat(r_pixel_scale, ParamStr(idx)) then r_pixel_scale := 1.0;
-        Inc(idx);
-      end;
-    end;
+      {$IFNDEF HEADLESS}
+        r_Window_DrawLoading(forceUpdate);
+      {$ENDIF}
+      e_SoundUpdate();
+      if NetMode = NET_SERVER then
+        g_Net_Host_Update
+      else if (NetMode = NET_CLIENT) and (NetState <> NET_STATE_AUTH) then
+        g_Net_Client_UpdateWhileLoading
+    end
   end;
 
-  r_Window_Initialize;
-
-  Init;
-  Time_Old := sys_GetTicks();
-
-  g_Net_InitLowLevel();
-
-  // Êîìàíäíàÿ ñòðîêà
-  if (ParamCount > 0) then g_Game_Process_Params();
-
-{$IFNDEF HEADLESS}
-  // Çàïðîñ ÿçûêà
-  if (not gGameOn) and gAskLanguage then g_Menu_AskLanguage();
-{$ENDIF}
-
-  e_WriteLog('Entering the main loop', TMsgType.Notify);
-
-  // main loop
-  while not ProcessMessage() do begin end;
-
-  g_Net_Slist_ShutdownAll();
-
-  Release();
-
-  g_Net_DeinitLowLevel();
-  result := 0;
-end;
-
-
-initialization
-  conRegVar('d_input', @g_dbg_input, '', '')
 end.

diff --git a/src/game/opengl/r_game.pas b/src/game/opengl/r_game.pas
index 8acd51b104fcd4cc973f9d1b79f23ae7fd4996f6..ebfdda5676d4d9a088a55cf14b2ee890cc829360 100644 (file)
--- a/src/game/opengl/r_game.pas
+++ b/src/game/opengl/r_game.pas
@@ -33,7 +33,7 @@ implementation
     g_system, g_touch,
     MAPDEF, xprofiler, utils, wadreader,
     g_textures, e_input, e_sound,
-    g_language, g_console, g_menu, g_triggers, g_player, g_options, g_monsters, g_map, g_panel, g_window,
+    g_language, g_console, g_menu, g_triggers, g_player, g_options, g_monsters, g_map, g_panel,
     g_items, g_weapons, g_gfx, g_phys, g_net, g_gui, g_netmaster,
     g_game, r_console, r_gfx, r_items, r_map, r_panel, r_monsters, r_weapons, r_netmaster, r_player
   ;

diff --git a/src/game/sdl/g_system.pas b/src/game/sdl/g_system.pas
index 7527073c1ad7e0ad811001cf519c7bcf2476bd46..c191583fa77f2a5c77a0cfa2c9e2204ccbe576bc 100644 (file)
--- a/src/game/sdl/g_system.pas
+++ b/src/game/sdl/g_system.pas
@@ -46,7 +46,7 @@ implementation
     SysUtils, SDL, Math,
     {$INCLUDE ../nogl/noGLuses.inc}
     e_log, r_graphics, e_input, e_sound,
-    g_options, g_window, g_console, g_game, g_menu, g_gui, g_basic;
+    g_options, g_console, g_game, g_menu, g_gui, g_basic;
 
   const
     GameTitle = 'Doom 2D: Forever (SDL 1.2, %s)';

diff --git a/src/game/sdl2/g_system.pas b/src/game/sdl2/g_system.pas
index fd79aa60e30f651f9ecda934dcc1d90bf1cbc674..ff52b1dc98ba163f82a82ed391c6564462da24bd 100644 (file)
--- a/src/game/sdl2/g_system.pas
+++ b/src/game/sdl2/g_system.pas
@@ -49,7 +49,7 @@ implementation
     {$IFDEF ENABLE_HOLMES}
       g_holmes, sdlcarcass, fui_ctls,
     {$ENDIF}
-    g_touch, g_options, g_window, g_console, g_game, g_menu, g_gui, g_basic;
+    g_touch, g_options, g_console, g_game, g_menu, g_gui, g_basic;
 
   const
     GameTitle = 'Doom 2D: Forever (SDL 2, %s)';

diff --git a/src/game/sdl2/g_touch.pas b/src/game/sdl2/g_touch.pas
index 12a46645989b8d016dd6cc056c3aeab61e4ad935..629ca3a69fde4a62f866d0bcf140f2ba131f3190 100644 (file)
--- a/src/game/sdl2/g_touch.pas
+++ b/src/game/sdl2/g_touch.pas
@@ -36,7 +36,7 @@ implementation
 
   uses
     SysUtils,
-    e_log, r_graphics, e_input, g_options, g_game, g_gui, g_weapons, g_console, g_window;
+    e_log, r_graphics, e_input, g_options, g_game, g_gui, g_weapons, g_console;
 
   var
     angleFire: Boolean;