X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2FDoom2DF.lpr;h=a93c9bb4a3cd5733d3d633b31badece02122ac43;hb=ccf3b9b5fb4ba13babae9405db4022821b82dc5f;hp=4aecd4026ac048917850dca9611028047d7a74df;hpb=35f9a0ca016af5ef3dac8dc6ba97dcbf659f6176;p=d2df-sdl.git

diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index 4aecd40..a93c9bb 100644
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
@@ -161,6 +161,11 @@ uses
     {$ENDIF}
   {$ENDIF}
 
+  {$IFDEF ENABLE_MENU}
+    g_gui in 'g_gui.pas',
+    g_menu in 'g_menu.pas',
+  {$ENDIF}
+
 {$IFDEF ENABLE_RENDER}
   {$I ../shared/vampimg.inc}
   r_animations in 'opengl/r_animations.pas',
@@ -185,8 +190,7 @@ uses
     r_touch in 'opengl/r_touch.pas',
   {$ENDIF}
   {$IFDEF ENABLE_MENU}
-    g_gui in 'g_gui.pas',
-    g_menu in 'g_menu.pas',
+    r_gui in 'opengl/r_gui.pas',
   {$ENDIF}
 {$ENDIF}
 
@@ -390,7 +394,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
@@ -399,11 +402,6 @@ begin
             16: uiContext.font := 'win16';
           end;
         end;
-        {$ELSE}
-        // fuck off, fpc!
-        itmp := itmp;
-        valres := valres;
-        {$ENDIF}
         Inc(idx);
       end;
     end;
@@ -1035,7 +1033,6 @@ end;
     g_Game_Init;
     {$IFDEF ENABLE_MENU}
       g_Menu_Init;
-      g_GUI_Init;
     {$ENDIF}
     g_Game_Process_Params;
     // TODO reload GAME textures