X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_window.pas;h=8e6bbe80de9c9ed2f53fd5b3191ee183fa5757ae;hb=f8b890fbb992358cc8178e8636fda1f4b81de3d6;hp=992c0234419ffd4c5370b705fe8815a4eac8bd09;hpb=40aef8e7c0887d12cec058787540e83f0badf4dd;p=d2df-sdl.git

diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index 992c023..8e6bbe8 100644
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
@@ -44,7 +44,7 @@ uses
   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
@@ -55,8 +55,6 @@ var
   flag: Boolean;
   wNeedTimeReset: Boolean = false;
   wMinimized: Boolean = false;
-  wMaximized: Boolean = false;
-  wLoadingProgress: Boolean = false;
   wLoadingQuit: Boolean = false;
 
 procedure ResetTimer ();
@@ -70,27 +68,13 @@ var
 {$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
@@ -124,8 +108,6 @@ begin
   begin
     if (NetMode = NET_CLIENT) and (NetState <> NET_STATE_AUTH) then g_Net_Client_UpdateWhileLoading();
   end;
-
-  wLoadingProgress := false;
 end;
 
 
@@ -246,9 +228,6 @@ end;
 function SDLMain (): Integer;
 var
   idx: Integer;
-  {$IF not DEFINED(HEADLESS)}
-  ltmp: Integer;
-  {$ENDIF}
   arg: AnsiString;
   mdfo: TStream;
   {$IFDEF ENABLE_HOLMES}
@@ -258,14 +237,6 @@ var
 begin
 {$IFDEF HEADLESS}
   e_NoGraphics := true;
-{$ELSE}
-  {$IFDEF ENABLE_HOLMES}
-    if (not g_holmes_imfunctional) then
-    begin
-      uiInitialize();
-      uiContext.font := 'win14';
-    end;
-  {$ENDIF}
 {$ENDIF}
 
   idx := 1;
@@ -351,14 +322,20 @@ begin
     end;
   end;
 
+{$IFNDEF USE_SYSSTUB}
   PrintGLSupportedExtensions;
   glLegacyNPOT := GLExtensionSupported('GL_ARB_texture_non_power_of_two') or GLExtensionSupported('GL_OES_texture_npot');
+{$ELSE}
+  glLegacyNPOT := False;
+{$ENDIF}
   e_logWritefln('NPOT textures: %s', [glLegacyNPOT]);
   gwin_dump_extensions := false;
 
   Init;
   Time_Old := sys_GetTicks();
 
+  g_Net_InitLowLevel();
+
   // Êîìàíäíàÿ ñòðîêà
   if (ParamCount > 0) then g_Game_Process_Params();
 
@@ -372,7 +349,11 @@ begin
   // main loop
   while not ProcessMessage() do begin end;
 
+  g_Net_Slist_ShutdownAll();
+
   Release();
+
+  g_Net_DeinitLowLevel();
   result := 0;
 end;