moved FlexUI fonts to "flexui.wad"

[d2df-sdl.git] / src / game / g_main.pas

diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 734ae36ff49f1d76f11d66d7930c63d7c81c5908..2a444ead437b2e2e6cad6313405e344d309ed38d 100644 (file)
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
@@ -43,7 +43,7 @@ uses
   g_weapons, SysUtils, g_triggers, MAPDEF, g_map,
   g_menu, g_language, g_net, g_holmes,
   utils, conbuf, envvars, fui_wadread, fui_style,
-  xparser;
+  fui_gfx_gl, xparser;
 
 
 var
@@ -109,7 +109,6 @@ begin
   try
     e_LogWriteln('FlexUI: loading stylesheet...');
     uiLoadStyles('flexui/widgets.wgs');
-    g_holmes_imfunctional := false;
   except on e: TParserException do
     begin
       writeln('ERROR at (', e.tokLine, ',', e.tokCol, '): ', e.message);
@@ -120,6 +119,21 @@ 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;
+  except on e: Exception do
+    begin
+      writeln('ERROR loading FlexUI fonts');
+      //raise;
+    end;
+  else
+    begin
+      //raise;
+    end;
+  end;
 {$ENDIF}
 
   e_WriteLog('Entering SDLMain', TMsgType.Notify);