do not bilinear anything except sky

[d2df-sdl.git] / src / game / g_map.pas

diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index c395dab92374f94db5ffefe36903406bf1646bfd..1b92a967f0c31115b5101b3db1be3c003c1ae070 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
@@ -242,7 +242,7 @@ var
 implementation
 
 uses
-  e_input, g_main, e_log, SysUtils, g_items, g_gfx, g_console,
+  e_input, g_main, e_log, e_texture, SysUtils, g_items, g_gfx, g_console,
   GL, GLExt, g_weapons, g_game, g_sound, e_sound, CONFIG,
   g_options, g_triggers, g_player,
   Math, g_monsters, g_saveload, g_language, g_netmsg,
@@ -1620,6 +1620,7 @@ var
   moveSpeed{, moveStart, moveEnd}: TDFPoint;
   //moveActive: Boolean;
   pan: TPanel;
+  mapOk: Boolean = false;
 begin
   mapGrid.Free();
   mapGrid := nil;
@@ -1671,7 +1672,7 @@ begin
     e_LogWritefln('Loading map: %s', [mapResName], MSG_NOTIFY);
     g_Game_SetLoadingText(_lc[I_LOAD_MAP], 0, False);
 
-    stt := curTimeMicro();
+    stt := getTimeMicro();
 
     try
       mapReader := g_Map_ParseMap(Data, Len);
@@ -1690,6 +1691,8 @@ begin
       exit;
     end;
 
+    gCurrentMap := mapReader;
+
     generateExternalResourcesList(mapReader);
     mapTextureList := mapReader['texture'];
     // get all other lists here too
@@ -1778,6 +1781,8 @@ begin
         begin
           e_WriteLog('error loading map: invalid texture index for panel', MSG_FATALERROR);
           result := false;
+          gCurrentMap := nil;
+          gCurrentMapFileName := '';
           exit;
         end;
       end;
@@ -2079,26 +2084,28 @@ begin
     mapReader := nil;
 
     // Çàãðóçêà íåáà
-    if gMapInfo.SkyName <> '' then
+    if (gMapInfo.SkyName <> '') then
     begin
       e_WriteLog('  Loading sky: ' + gMapInfo.SkyName, MSG_NOTIFY);
       g_Game_SetLoadingText(_lc[I_LOAD_SKY], 0, False);
       FileName := g_ExtractWadName(gMapInfo.SkyName);
 
-      if FileName <> '' then
-        FileName := GameDir+'/wads/'+FileName
-      else
-        begin
-          FileName := g_ExtractWadName(Res);
-        end;
+      if (FileName <> '') then FileName := GameDir+'/wads/'+FileName else FileName := g_ExtractWadName(Res);
 
-      s := FileName+':'+g_ExtractFilePathName(gMapInfo.SkyName);
-      if g_Texture_CreateWAD(BackID, s) then
+      if gTextureFilter then TEXTUREFILTER := GL_LINEAR else TEXTUREFILTER := GL_NEAREST;
+      try
+        s := FileName+':'+g_ExtractFilePathName(gMapInfo.SkyName);
+        if g_Texture_CreateWAD(BackID, s) then
         begin
           g_Game_SetupScreenSize();
         end
-      else
-        g_FatalError(Format(_lc[I_GAME_ERROR_SKY], [s]));
+        else
+        begin
+          g_FatalError(Format(_lc[I_GAME_ERROR_SKY], [s]));
+        end;
+      finally
+        TEXTUREFILTER := GL_NEAREST;
+      end;
     end;
 
     // Çàãðóçêà ìóçûêè
@@ -2154,12 +2161,18 @@ begin
       gMusic.SetByName('');
     end;
 
-    stt := curTimeMicro()-stt;
+    stt := getTimeMicro()-stt;
     e_LogWritefln('map loaded in %s.%s milliseconds', [Integer(stt div 1000), Integer(stt mod 1000)]);
+    mapOk := true;
   finally
     sfsGCEnable(); // enable releasing unused volumes
     mapReader.Free();
     e_ClearInputBuffer(); // why not?
+    if not mapOk then
+    begin
+      gCurrentMap := nil;
+      gCurrentMapFileName := '';
+    end;
   end;
 
   e_WriteLog('Done loading map.', MSG_NOTIFY);