diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index 5f04992969bd4ace2b25683a447b5613f5caa877..97d359ea088d269019be92376800c7401dbc6557 100644 (file)
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
uses
{$IFDEF WINDOWS}Windows,{$ENDIF}
SysUtils, Classes, MAPDEF,
- SDL2, GL, GLExt, e_graphics, e_log, g_main,
+ SDL2, GL, GLExt, e_graphics, e_log, e_texture, g_main,
g_console, e_input, g_options, g_game,
g_basic, g_textures, e_sound, g_sound, g_menu, ENet, g_net,
g_map, g_gfx, g_monsters, g_holmes, xprofiler, utils;
Result := False;
- e_WriteLog('Setting display mode...', MSG_NOTIFY);
+ e_WriteLog('Setting display mode...', TMsgType.Notify);
wFlags := SDL_WINDOW_OPENGL or SDL_WINDOW_RESIZABLE;
if gFullscreen then wFlags := wFlags or SDL_WINDOW_FULLSCREEN;
pw := mode.w; ph := mode.h
end;
- e_WriteLog('SDL: Got ' + IntToStr(k) + ' resolutions.', MSG_NOTIFY);
+ e_WriteLog('SDL: Got ' + IntToStr(k) + ' resolutions.', TMsgType.Notify);
end;
procedure Sleep(ms: LongWord);
if g_debug_WinMsgs then
begin
g_Console_Add('Now minimized');
- e_WriteLog('[DEBUG] WinMsgs: Now minimized', MSG_NOTIFY);
+ e_WriteLog('[DEBUG] WinMsgs: Now minimized', TMsgType.Notify);
end;
wDeactivate := True;
end;
if g_debug_WinMsgs then
begin
g_Console_Add('Resized to ' + IntToStr(ev.data1) + 'x' + IntToStr(ev.data2));
- e_WriteLog('[DEBUG] WinMsgs: Resized to ' + IntToStr(ev.data1) + 'x' + IntToStr(ev.data2), MSG_NOTIFY);
+ e_WriteLog('[DEBUG] WinMsgs: Resized to ' + IntToStr(ev.data1) + 'x' + IntToStr(ev.data2), TMsgType.Notify);
end;
end;
if g_debug_WinMsgs then
begin
g_Console_Add('Now maximized');
- e_WriteLog('[DEBUG] WinMsgs: Now maximized', MSG_NOTIFY);
+ e_WriteLog('[DEBUG] WinMsgs: Now maximized', TMsgType.Notify);
end;
end;
end;
if g_debug_WinMsgs then
begin
g_Console_Add('Now restored');
- e_WriteLog('[DEBUG] WinMsgs: Now restored', MSG_NOTIFY);
+ e_WriteLog('[DEBUG] WinMsgs: Now restored', TMsgType.Notify);
end;
end;
begin
if gWinActive then
begin
- e_WriteLog('deactivating window', MSG_NOTIFY);
+ e_WriteLog('deactivating window', TMsgType.Notify);
e_EnableInput := False;
e_ClearInputBuffer();
if g_debug_WinMsgs then
begin
g_Console_Add('Now inactive');
- e_WriteLog('[DEBUG] WinMsgs: Now inactive', MSG_NOTIFY);
+ e_WriteLog('[DEBUG] WinMsgs: Now inactive', TMsgType.Notify);
end;
gWinActive := False;
if g_debug_WinMsgs then
begin
g_Console_Add('Now active');
- e_WriteLog('[DEBUG] WinMsgs: Now active', MSG_NOTIFY);
+ e_WriteLog('[DEBUG] WinMsgs: Now active', TMsgType.Notify);
end;
gWinActive := True;
gWinSizeY := gScreenHeight;
wTitle := Title;
- e_WriteLog('Creating window', MSG_NOTIFY);
+ e_WriteLog('Creating window', TMsgType.Notify);
if not g_Window_SetDisplay() then
begin
KillGLWindow();
- e_WriteLog('Window creation error (resolution not supported?)', MSG_FATALERROR);
+ e_WriteLog('Window creation error (resolution not supported?)', TMsgType.Fatal);
exit;
end;
while (exts[i] <> #0) and (exts[i] <> ' ') do Inc(i);
if i > 255 then
begin
- e_WriteLog('FUUUUUUUUUUUUU', MSG_WARNING);
+ e_WriteLog('FUUUUUUUUUUUUU', TMsgType.Warning);
end
else
begin
Move(exts^, extName[1], i);
extName[0] := Char(i);
- e_WriteLog(Format('EXT: %s', [extName]), MSG_NOTIFY);
+ e_WriteLog(Format('EXT: %s', [extName]), TMsgType.Notify);
end;
end;
found := true;
end;
end;
- {$IF DEFINED(D2F_DEBUG)}
if (arg = '--game-scale') or (arg = '-game-scale') then
begin
if (idx <= ParamCount) then
Inc(idx);
end;
end;
- {$ENDIF}
if (arg = '--write-mapdef') or (arg = '-write-mapdef') then
begin
end;
end;
- e_WriteLog('Initializing OpenGL', MSG_NOTIFY);
+ e_WriteLog('Initializing OpenGL', TMsgType.Notify);
InitOpenGL(gVSync);
- e_WriteLog('Creating GL window', MSG_NOTIFY);
+ e_WriteLog('Creating GL window', TMsgType.Notify);
if not CreateGLWindow(PChar(Format('Doom 2D: Forever %s', [GAME_VERSION]))) then
begin
Result := 0;
{EnumDisplayModes();}
+ {$IFDEF HEADLESS}
+ gwin_k8_enable_light_experiments := false;
+ gwin_has_stencil := false;
+ glLegacyNPOT := false;
+ gwin_dump_extensions := false;
+ {$ELSE}
if gwin_k8_enable_light_experiments then
begin
SDL_GL_GetAttribute(SDL_GL_STENCIL_SIZE, @ltmp);
- e_WriteLog(Format('stencil buffer size: %d', [ltmp]), MSG_WARNING);
+ e_WriteLog(Format('stencil buffer size: %d', [ltmp]), TMsgType.Warning);
gwin_has_stencil := (ltmp > 0);
end
else
if not glHasExtension('GL_ARB_texture_non_power_of_two') then
begin
- e_WriteLog('Driver DID''T advertised NPOT textures support', MSG_WARNING);
+ e_WriteLog('Driver DID''T advertised NPOT textures support', TMsgType.Warning);
glLegacyNPOT := true;
end
else
begin
- e_WriteLog('Driver advertised NPOT textures support', MSG_NOTIFY);
+ e_WriteLog('Driver advertised NPOT textures support', TMsgType.Notify);
glLegacyNPOT := false;
end;
gwin_dump_extensions := false;
+ {$ENDIF}
Init();
Time_Old := GetTimer();
if (not gGameOn) and gAskLanguage then
g_Menu_AskLanguage();
- e_WriteLog('Entering the main loop', MSG_NOTIFY);
+ e_WriteLog('Entering the main loop', TMsgType.Notify);
while not ProcessMessage() do
{ Main Loop } ;