X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_main.pas;h=734ae36ff49f1d76f11d66d7930c63d7c81c5908;hb=5368f6638623f763633157cdd4920bf2cb66fce5;hp=57f12e98a45349501ccb52fd666817503eae7731;hpb=4eb0c3143f39926323e44d590cae60131d11001e;p=d2df-sdl.git diff --git a/src/game/g_main.pas b/src/game/g_main.pas index 57f12e9..734ae36 100644 --- a/src/game/g_main.pas +++ b/src/game/g_main.pas @@ -41,8 +41,9 @@ uses e_graphics, e_input, g_game, g_console, g_gui, e_sound, g_options, g_sound, g_player, g_weapons, SysUtils, g_triggers, MAPDEF, g_map, - g_menu, g_language, g_net, - utils, conbuf, envvars; + g_menu, g_language, g_net, g_holmes, + utils, conbuf, envvars, fui_wadread, fui_style, + xparser; var @@ -99,13 +100,35 @@ begin SDL_StartTextInput(); {$ENDIF} +{$IFNDEF HEADLESS} + 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'); + g_holmes_imfunctional := false; + except on e: TParserException do + begin + writeln('ERROR at (', e.tokLine, ',', e.tokCol, '): ', e.message); + //raise; + end; + else + begin + //raise; + end; + end; +{$ENDIF} + e_WriteLog('Entering SDLMain', TMsgType.Notify); {$WARNINGS OFF} SDLMain(); {$WARNINGS ON} -{$IFDEF HEADLESS} +{$IFNDEF HEADLESS} SDL_StopTextInput(); {$ENDIF}