X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_main.pas;h=b5a22840fbda68d7b604cb420dd1e351f07f0fb2;hb=82a1406ad9697d26709a7aa1aeb7c78441bee530;hp=7de78252194aea44adfb3baf70463f403f5ede8b;hpb=4d5a94c228a43cdd0333979f3aa218c56c248188;p=d2df-sdl.git

diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 7de7825..b5a2284 100644
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
@@ -52,6 +52,9 @@ var
 procedure Main();
 var
   sdlflags: LongWord;
+{$IFNDEF HEADLESS}
+  flexloaded: Boolean;
+{$ENDIF}
 begin
   e_InitWritelnDriver();
 
@@ -101,39 +104,48 @@ begin
 {$ENDIF}
 
 {$IFNDEF HEADLESS}
+  flexloaded := true;
   if not fuiAddWad('flexui.wad') then
   begin
     if not fuiAddWad('./data/flexui.wad') then fuiAddWad('./flexui.wad');
   end;
-  g_holmes_imfunctional := true;
-  try
-    e_LogWriteln('FlexUI: loading stylesheet...');
-    uiLoadStyles('flexui/widgets.wgs');
-  except on e: TParserException do
-    begin
-      writeln('ERROR at (', e.tokLine, ',', e.tokCol, '): ', e.message);
-      //raise;
-    end;
-  else
-    begin
-      //raise;
-    end;
-  end;
   try
     fuiGfxLoadFont('win8', 'flexui/fonts/win8.fuifont');
     fuiGfxLoadFont('win14', 'flexui/fonts/win14.fuifont');
     fuiGfxLoadFont('win16', 'flexui/fonts/win16.fuifont');
-    g_holmes_imfunctional := false;
+    fuiGfxLoadFont('dos8', 'flexui/fonts/dos8.fuifont');
+    fuiGfxLoadFont('msx6', 'flexui/fonts/msx6.fuifont');
   except on e: Exception do
     begin
       writeln('ERROR loading FlexUI fonts');
+      flexloaded := false;
       //raise;
     end;
   else
     begin
+      flexloaded := false;
       //raise;
     end;
   end;
+  if (flexloaded) then
+  begin
+    try
+      e_LogWriteln('FlexUI: loading stylesheet...');
+      uiLoadStyles('flexui/widgets.wgs');
+    except on e: TParserException do
+      begin
+        writeln('ERROR at (', e.tokLine, ',', e.tokCol, '): ', e.message);
+        //raise;
+        flexloaded := false;
+      end;
+    else
+      begin
+        //raise;
+        flexloaded := false;
+      end;
+    end;
+  end;
+  g_holmes_imfunctional := not flexloaded;
 {$ENDIF}
 
   e_WriteLog('Entering SDLMain', TMsgType.Notify);