diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index 002e51aa92284fa9db8cdaf39da94dcc8174dc71..afc23e2b1b22a6e22f4adcd9e89cfa154495e10b 100644 (file)
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
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, xprofiler,
- g_touch, g_gui, g_system;
+ g_touch, g_gui, g_system, g_netmaster;
const
flag: Boolean;
wNeedTimeReset: Boolean = false;
wMinimized: Boolean = false;
- wMaximized: Boolean = false;
- wLoadingProgress: Boolean = false;
wLoadingQuit: Boolean = false;
procedure ResetTimer ();
{$ENDIF}
procedure ProcessLoading (forceUpdate: Boolean=false);
-var
{$IFNDEF HEADLESS}
-// ev: TSDL_Event;
+var
stt: UInt64;
{$ENDIF}
begin
-// FillChar(ev, sizeof(ev), 0);
- wLoadingProgress := true;
-
-// while (SDL_PollEvent(@ev) > 0) do
-// begin
-// EventHandler(ev);
-// if (ev.type_ = SDL_QUITEV) then break;
-// end;
- //e_PollJoysticks();
-
-// if (ev.type_ = SDL_QUITEV) or (gExit = EXIT_QUIT) then
-// begin
-// wLoadingProgress := false;
-// exit;
-// end;
+ if sys_HandleInput() = True then
+ Exit;
{$IFNDEF HEADLESS}
if not wMinimized then
begin
if (NetMode = NET_CLIENT) and (NetState <> NET_STATE_AUTH) then g_Net_Client_UpdateWhileLoading();
end;
-
- wLoadingProgress := false;
end;
end;
function GLExtensionList (): SSArray;
- var s: PChar; i, j, num: GLint;
+var
+ s: PChar;
+ i, j, num: GLint;
begin
result := nil;
s := glGetString(GL_EXTENSIONS);
if s <> nil then
begin
- num := 0; i := 0; j := 0;
- while s[i] <> #0 do
+ num := 0;
+ i := 0;
+ j := 0;
+ while (s[i] <> #0) and (s[i] = ' ') do Inc(i);
+ while (s[i] <> #0) do
begin
while (s[i] <> #0) and (s[i] <> ' ') do Inc(i);
- SetLength(result, num + 1);
- result[num] := Copy(s, j, i - j);
+ SetLength(result, num+1);
+ result[num] := Copy(s, j+1, i-j);
while (s[i] <> #0) and (s[i] = ' ') do Inc(i);
j := i;
- Inc(num)
- end
- end
+ Inc(num);
+ end;
+ end;
end;
function GLExtensionSupported (ext: AnsiString): Boolean;
- var i, len: GLint; exts: SSArray;
+var
+ exts: SSArray;
+ e: AnsiString;
begin
result := false;
exts := GLExtensionList();
- if exts <> nil then
+ for e in exts do
begin
- i := 0; len := Length(exts);
- while (i < len) and (exts[i] <> ext) do Inc(i);
- result := i < len
- end
+ //writeln('<', e, '> : [', ext, '] = ', strEquCI1251(e, ext));
+ if (strEquCI1251(e, ext)) then begin result := true; exit; end;
+ end;
end;
procedure PrintGLSupportedExtensions;
function SDLMain (): Integer;
var
idx: Integer;
- {$IF not DEFINED(HEADLESS)}
- ltmp: Integer;
- {$ENDIF}
arg: AnsiString;
mdfo: TStream;
{$IFDEF ENABLE_HOLMES}
end;
end;
+{$IFNDEF USE_SYSSTUB}
PrintGLSupportedExtensions;
- glLegacyNPOT := GLExtensionSupported('GL_ARB_texture_non_power_of_two') or GLExtensionSupported('GL_OES_texture_npot');
- e_logWritefln('NPOT textures: %s', [glLegacyNPOT]);
+ glLegacyNPOT := not (GLExtensionSupported('GL_ARB_texture_non_power_of_two') or GLExtensionSupported('GL_OES_texture_npot'));
+{$ELSE}
+ glLegacyNPOT := False;
+{$ENDIF}
+ if glNPOTOverride and glLegacyNPOT then
+ begin
+ glLegacyNPOT := true;
+ e_logWriteln('NPOT texture emulation: FORCED');
+ end
+ else
+ begin
+ if (glLegacyNPOT) then e_logWriteln('NPOT texture emulation: enabled')
+ else e_logWriteln('NPOT texture emulation: disabled');
+ end;
gwin_dump_extensions := false;
Init;
Time_Old := sys_GetTicks();
+ g_Net_InitLowLevel();
+
// Êîìàíäíàÿ ñòðîêà
if (ParamCount > 0) then g_Game_Process_Params();
// main loop
while not ProcessMessage() do begin end;
+ g_Net_Slist_ShutdownAll();
+
Release();
+
+ g_Net_DeinitLowLevel();
result := 0;
end;