X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_map.pas;h=eb9454263364990821dbb6ab0bdd5b4bc4ded22c;hb=d0936017ccb8a078d1b03f55478af284bb015bbc;hp=92ce86baa347358063dd0affc4388b7a6b51437f;hpb=0a15e02146dcf1f0ebbd1d99d0f1350c4bc7d63b;p=d2df-sdl.git

diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 92ce86b..eb94542 100644
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
@@ -20,7 +20,7 @@ interface
 
 uses
   SysUtils, Classes, mempool,
-  e_graphics, g_basic, MAPDEF, g_textures,
+  g_base, r_graphics, g_basic, MAPDEF, g_textures,
   g_phys, utils, g_panel, g_grid, md5, binheap, xprofiler, xparser, xdynrec;
 
 type
@@ -246,8 +246,7 @@ var
 implementation
 
 uses
-  {$INCLUDE ../nogl/noGLuses.inc}
-  e_input, g_main, e_log, e_texture, e_res, g_items, g_gfx, g_console,
+  e_input, e_log, e_res, g_items, g_gfx, g_console,
   g_weapons, g_game, g_sound, e_sound, CONFIG,
   g_options, g_triggers, g_player,
   Math, g_monsters, g_saveload, g_language, g_netmsg,
@@ -2203,16 +2202,11 @@ begin
     begin
       e_WriteLog('  Loading sky: ' + gMapInfo.SkyName, TMsgType.Notify);
       g_Game_SetLoadingText(_lc[I_LOAD_SKY], 0, False);
-      if gTextureFilter then TEXTUREFILTER := GL_LINEAR else TEXTUREFILTER := GL_NEAREST;
-      try
-        s := e_GetResourcePath(WadDirs, gMapInfo.SkyName, g_ExtractWadName(Res));
-        if g_Texture_CreateWAD(BackID, s) then
-          g_Game_SetupScreenSize
-        else
-          g_FatalError(Format(_lc[I_GAME_ERROR_SKY], [s]))
-      finally
-        TEXTUREFILTER := GL_NEAREST;
-      end;
+      s := e_GetResourcePath(WadDirs, gMapInfo.SkyName, g_ExtractWadName(Res));
+      if g_Texture_CreateWAD(BackID, s, gTextureFilter) then
+        g_Game_SetupScreenSize
+      else
+        g_FatalError(Format(_lc[I_GAME_ERROR_SKY], [s]))
     end;
 
     // Çàãðóçêà ìóçûêè