diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index 258b489b1f8f35f335061f207515c48406bab2b0..d04c8b37477b2dfe1147558a302e48322efe824d 100644 (file)
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
-(* Copyright (C) DooM 2D:Forever Developers
+(* Copyright (C) Doom 2D: Forever Developers
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
const
- ProgressUpdateMSecs = 100;
+ ProgressUpdateMSecs = 1;//100;
var
h_Wnd: PSDL_Window = nil;
procedure KillGLWindow ();
begin
- if (h_Wnd <> nil) then
- begin
- if assigned(oglDeinitCB) then oglDeinitCB();
- end;
+ if (h_GL <> nil) then begin if (assigned(oglDeinitCB)) then oglDeinitCB(); end;
if (h_Wnd <> nil) then SDL_DestroyWindow(h_Wnd);
if (h_GL <> nil) then SDL_GL_DeleteContext(h_GL);
h_Wnd := nil;
SDL_GL_MakeCurrent(h_Wnd, h_GL);
SDL_ShowCursor(SDL_DISABLE);
- if (h_GL <> nil) then
- begin
- if assigned(oglInitCB) then oglInitCB();
- end;
+ fuiScrWdt := gScreenWidth;
+ fuiScrHgt := gScreenHeight;
+ if (h_GL <> nil) then begin if (assigned(oglInitCB)) then oglInitCB(); end;
{$ENDIF}
result := true;
gWinSizeX := gScreenWidth;
gWinSizeY := gScreenHeight;
{$IF not DEFINED(HEADLESS)}
+ fuiScrWdt := gScreenWidth;
+ fuiScrHgt := gScreenHeight;
e_ResizeWindow(gScreenWidth, gScreenHeight);
g_Game_SetupScreenSize();
g_Menu_Reset();
{$IF not DEFINED(HEADLESS)}
h_Gl := SDL_GL_CreateContext(h_Wnd);
if (h_Gl = nil) then exit;
- if assigned(oglInitCB) then oglInitCB();
+ fuiScrWdt := gScreenWidth;
+ fuiScrHgt := gScreenHeight;
+ if (assigned(oglInitCB)) then oglInitCB();
{$ENDIF}
e_ResizeWindow(gScreenWidth, gScreenHeight);
begin
if g_Texture_Get('INTER', ID) then
begin
- e_DrawSize(ID, 0, 0, 0, false, false, gScreenWidth, gScreenHeight)
+ e_DrawSize(ID, 0, 0, 0, false, false, gScreenWidth, gScreenHeight);
+ e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 100);
end
else
begin
{$ENDIF}
arg: AnsiString;
mdfo: TStream;
+ itmp: Integer;
+ valres: Word;
begin
{$IFDEF HEADLESS}
e_NoGraphics := true;
+{$ELSE}
+ if (not g_holmes_imfunctional) then
+ begin
+ uiInitialize();
+ uiContext.font := 'win14';
+ end;
{$ENDIF}
idx := 1;
{.$ENDIF}
if arg = '--holmes' then begin g_holmes_enabled := true; g_Game_SetDebugMode(); end;
+
if (arg = '--holmes-ui-scale') or (arg = '-holmes-ui-scale') then
begin
if (idx <= ParamCount) then
end;
end;
+ if (arg = '--holmes-font') or (arg = '-holmes-font') then
+ begin
+ if (idx <= ParamCount) then
+ begin
+ itmp := 0;
+ val(ParamStr(idx), itmp, valres);
+ {$IFNDEF HEADLESS}
+ if (valres = 0) and (not g_holmes_imfunctional) then
+ begin
+ case itmp of
+ 8: uiContext.font := 'win8';
+ 14: uiContext.font := 'win14';
+ 16: uiContext.font := 'win16';
+ end;
+ end;
+ {$ELSE}
+ // fuck off, fpc!
+ itmp := itmp;
+ valres := valres;
+ {$ENDIF}
+ Inc(idx);
+ end;
+ end;
+
if (arg = '--game-scale') or (arg = '-game-scale') then
begin
if (idx <= ParamCount) then