gl: move holmes drawing code into render

[d2df-sdl.git] / src / game / Doom2DF.lpr

diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index d5e43767143bf0f5fbe8c4df0f705948acc526f7..3282cab97e9277059454f2fed173afd9fb7c6bd0 100644 (file)
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
@@ -144,7 +144,7 @@ uses
   g_playermodel in 'g_playermodel.pas',
   g_saveload in 'g_saveload.pas',
   g_sound in 'g_sound.pas',
-  g_textures in 'g_textures.pas',
+  g_animations in 'g_animations.pas',
   g_triggers in 'g_triggers.pas',
   g_weapons in 'g_weapons.pas',
   g_window in 'g_window.pas',
@@ -206,6 +206,10 @@ uses
     r_common in 'renders/opengl/r_common.pas',
     r_console in 'renders/opengl/r_console.pas',
     r_gui in 'renders/opengl/r_gui.pas',
+    r_loadscreen in 'renders/opengl/r_loadscreen.pas',
+    {$IFDEF ENABLE_HOLMES}
+      r_holmes in 'renders/opengl/r_holmes.pas',
+    {$ENDIF}
   {$ELSE}
     {$FATAL render driver not selected}
   {$ENDIF}
@@ -237,6 +241,7 @@ uses
 
   fui_wadread in '../flexui/fui_wadread.pas',
   fui_common in '../flexui/fui_common.pas',
+//  fui_gfx in '../flexui/fui_gfx.pas',
   fui_gfx_gl in '../flexui/fui_gfx_gl.pas',
   fui_events in '../flexui/fui_events.pas',
   fui_style in '../flexui/fui_style.pas',
@@ -343,9 +348,6 @@ begin
     {$IFDEF ENABLE_RENDER}
       r_Render_Draw;
     {$ENDIF}
-    {$IFDEF ENABLE_SYSTEM}
-      sys_Repaint;
-    {$ENDIF}
     Frame := Time
   end
   else
@@ -1014,6 +1016,26 @@ end;
     {$ENDIF}
   end;
 
+  procedure ProcessLoading;
+    var update: Boolean;
+  begin
+    {$IFDEF ENABLE_SYSTEM}
+      update := sys_HandleInput() = False;
+    {$ELSE}
+      update := True;
+    {$ENDIF}
+    if update then
+    begin
+      e_SoundUpdate;
+      // TODO: At the moment, I left here only host network processing, because the client code must
+      // handle network events on its own. Otherwise separate network cases that use different calls to
+      // enet_host_service() WILL lose their packets (for example, resource downloading). So they have
+      // to handle everything by themselves. But in general, this MUST be removed completely, since
+      // updating the window should never affect the network. Use single enet_host_service(), period.
+      if NetMode = NET_SERVER then g_Net_Host_Update();
+    end
+  end;
+
   procedure Startup;
   begin
     Randomize;
@@ -1038,6 +1060,11 @@ end;
     DebugOptions;
     g_Net_InitLowLevel;
     // TODO init serverlist
+    {$IFDEF ENABLE_RENDER}
+      r_Render_SetProcessLoadingCallback(@ProcessLoading);
+    {$ENDIF}
+    g_Game_SetLoadingText(Format('Doom 2D: Forever %s', [GAME_VERSION]), 0, False);
+    g_Game_SetLoadingText('', 0, False);
     {$IFDEF ENABLE_HOLMES}
       InitHolmes;
     {$ENDIF}
@@ -1060,6 +1087,9 @@ end;
     {$ENDIF}
     Time_Old := GetTickCount64();
     while not ProcessMessage() do begin end;
+    {$IFDEF ENABLE_RENDER}
+      r_Render_SetProcessLoadingCallback(nil);
+    {$ENDIF}
     g_Console_WriteGameConfig;
     {$IFDEF ENABLE_MENU}
       g_GUI_Destroy;