X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fsfs%2Fsfs.pas;h=11e1045459cc1e894c28a9f35aa20f0e4bf6aafc;hb=1b91259cc2544a3e3dd76adb5e8f8ef0879fc199;hp=8437034e83685456ac9070bd9884cf215f54ccfb;hpb=5472594f32e33da0c66606ec9eebc8f798ef6b54;p=d2df-sdl.git

diff --git a/src/sfs/sfs.pas b/src/sfs/sfs.pas
index 8437034..11e1045 100644
--- a/src/sfs/sfs.pas
+++ b/src/sfs/sfs.pas
@@ -1,9 +1,8 @@
-(* Copyright (C)  DooM 2D:Forever Developers
+(* Copyright (C)  Doom 2D: Forever Developers
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +13,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *)
 // streaming file system (virtual)
-{$MODE DELPHI}
-{$R+}
+{$INCLUDE ../shared/a_modes.inc}
+{$SCOPEDENUMS OFF}
+{.$R+}
 {.$DEFINE SFS_VOLDEBUG}
 unit sfs;
 
@@ -415,6 +415,7 @@ end;
 
 type
   TVolumeInfo = class
+  public
     fFactory: TSFSVolumeFactory;
     fVolume: TSFSVolume;
     fPackName: AnsiString; // äëÿ îäíîãî è òîãî æå ôàéëà áóäåò òîëüêî îäèí òîì!
@@ -454,8 +455,7 @@ begin
   while f < volumes.Count do
   begin
     vi := TVolumeInfo(volumes[f]);
-    if vi = nil then continue;
-    if (not vi.fPermanent) and (vi.fOpenedFilesCount = 0) then
+    if (vi <> nil) and (not vi.fPermanent) and (vi.fOpenedFilesCount = 0) then
     begin
       // this volume probably can be removed
       used := false;