X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2FDoom2DF.lpr;h=0a361e60769563a5182c1a824522492982b08e2d;hb=57eea56cadbee2ab1e505f50144d1e1671deaa30;hp=28e3b6228ad0c23374b538de64b5130d14508934;hpb=9c48cca3ecf72ee2f326460c7fe895245544bdcf;p=d2df-sdl.git

diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index 28e3b62..0a361e6 100644
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
@@ -148,19 +148,20 @@ uses
   g_triggers in 'g_triggers.pas',
   g_weapons in 'g_weapons.pas',
   g_window in 'g_window.pas',
-{$IFNDEF HEADLESS}
-  {$IFDEF USE_SYSSTUB}
-    g_system in 'stub/g_system.pas',
-  {$ENDIF}
-  {$IFDEF USE_SDL}
-    g_system in 'sdl/g_system.pas',
-  {$ENDIF}
-  {$IFDEF USE_SDL2}
-    g_system in 'sdl2/g_system.pas',
+
+  {$IFDEF ENABLE_SYSTEM}
+    {$IFDEF USE_SYSSTUB}
+      g_system in 'stub/g_system.pas',
+    {$ENDIF}
+    {$IFDEF USE_SDL}
+      g_system in 'sdl/g_system.pas',
+    {$ENDIF}
+    {$IFDEF USE_SDL2}
+      g_system in 'sdl2/g_system.pas',
+    {$ENDIF}
   {$ENDIF}
-{$ENDIF}
 
-{$IFNDEF HEADLESS}
+{$IFDEF ENABLE_RENDER}
   {$I ../shared/vampimg.inc}
   r_animations in 'opengl/r_animations.pas',
   r_console in 'opengl/r_console.pas',
@@ -186,6 +187,7 @@ uses
   {$IFDEF ENABLE_MENU}
     g_gui in 'g_gui.pas',
     g_menu in 'g_menu.pas',
+    r_gui in 'opengl/r_gui.pas',
   {$ENDIF}
 {$ENDIF}
 
@@ -248,7 +250,7 @@ begin
        if (NetMode = NET_SERVER) then g_Net_Host_Update()
   else if (NetMode = NET_CLIENT) then g_Net_Client_Update();
   // think
-{$IFNDEF HEADLESS}
+{$IFDEF ENABLE_RENDER}
   r_Render_Update;
 {$ENDIF}
   g_Game_Update();
@@ -263,10 +265,10 @@ var
   Time, Time_Delta: Int64;
   Frame: Int64;
 begin
-  {$IFDEF HEADLESS}
-    Result := False;
-  {$ELSE}
+  {$IFDEF ENABLE_SYSTEM}
     Result := sys_HandleInput();
+  {$ELSE}
+    Result := False;
   {$ENDIF}
 
   Time := GetTickCount64();
@@ -315,10 +317,12 @@ begin
       gLerpFactor := 1.0
     else
       gLerpFactor := nmin(1.0, (Time - Time_Old) / 28.0);
-{$IFNDEF HEADLESS}
-    r_Render_Draw;
-    sys_Repaint;
-{$ENDIF}
+    {$IFDEF ENABLE_RENDER}
+      r_Render_Draw;
+    {$ENDIF}
+    {$IFDEF ENABLE_SYSTEM}
+      sys_Repaint;
+    {$ENDIF}
     Frame := Time
   end
   else
@@ -384,7 +388,6 @@ begin
       begin
         itmp := 0;
         val(ParamStr(idx), itmp, valres);
-        {$IFNDEF HEADLESS}
         if (valres = 0) and (not g_holmes_imfunctional) then
         begin
           case itmp of
@@ -393,11 +396,6 @@ begin
             16: uiContext.font := 'win16';
           end;
         end;
-        {$ELSE}
-        // fuck off, fpc!
-        itmp := itmp;
-        valres := valres;
-        {$ENDIF}
         Inc(idx);
       end;
     end;
@@ -940,7 +938,7 @@ end;
 
   procedure ScreenResize (w, h: Integer);
   begin
-    {$IFNDEF HEADLESS}
+    {$IFDEF ENABLE_RENDER}
       r_Render_Resize(w, h);
       {$IFDEF ENABLE_HOLMES}
         fuiScrWdt := w;
@@ -967,7 +965,7 @@ end;
     InitPrep;
     e_Input_Initialize;
     e_InitSoundSystem(NoSound);
-    {$IFNDEF HEADLESS}
+    {$IFDEF ENABLE_SYSTEM}
       sys_Init;
       sys_CharPress := @CharPress; (* install hook *)
       sys_ScreenResize := @ScreenResize; (* install hook *)
@@ -977,7 +975,7 @@ end;
     g_Console_Initialize;
     // TODO move load configs here
     g_Language_Set(gLanguage);
-    {$IFNDEF HEADLESS}
+    {$IFDEF ENABLE_RENDER}
       r_Render_Initialize;
     {$ENDIF}
     DebugOptions;
@@ -986,16 +984,15 @@ end;
     {$IFDEF ENABLE_HOLMES}
       InitHolmes;
     {$ENDIF}
-    {$IFDEF HEADLESS}
-      g_PlayerModel_LoadFake('doomer', 'doomer.wad');
-    {$ELSE}
+    {$IFDEF ENABLE_RENDER}
       g_PlayerModel_LoadAll;
       r_Render_Load;
+    {$ELSE}
+      g_PlayerModel_LoadFake('doomer', 'doomer.wad');
     {$ENDIF}
     g_Game_Init;
     {$IFDEF ENABLE_MENU}
       g_Menu_Init;
-      g_GUI_Init;
     {$ENDIF}
     g_Game_Process_Params;
     // TODO reload GAME textures
@@ -1011,7 +1008,7 @@ end;
       g_GUI_Destroy;
       g_Menu_Free;
     {$ENDIF}
-    {$IFNDEF HEADLESS}
+    {$IFDEF ENABLE_RENDER}
       r_Render_Free;
     {$ENDIF}
     {$IFDEF ENABLE_HOLMES}
@@ -1020,8 +1017,10 @@ end;
     g_Net_Slist_ShutdownAll;
     g_Net_DeinitLowLevel;
     (* g_Touch_Finalize; *)
-    {$IFNDEF HEADLESS}
+    {$IFDEF ENABLE_RENDER}
       r_Render_Finalize;
+    {$ENDIF}
+    {$IFDEF ENABLE_SYSTEM}
       sys_Final;
     {$ENDIF}
     g_Console_Finalize;