X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fshared%2Fwadreader.pas;h=2997bce0abac0b94b78c6a49f96b45dca027c65e;hb=c0e0a28f9c2ac9eb8e62791655d9baa3b6f978a0;hp=1c5fb19e123bded268c49037fb551d2efac87d9f;hpb=7908eab8a8bb5a2de31a03e588b2f12900c898c5;p=d2df-sdl.git

diff --git a/src/shared/wadreader.pas b/src/shared/wadreader.pas
index 1c5fb19..2997bce 100644
--- a/src/shared/wadreader.pas
+++ b/src/shared/wadreader.pas
@@ -1,3 +1,18 @@
+(* 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *)
 {$MODE DELPHI}
 unit wadreader;
 
@@ -50,10 +65,15 @@ function g_ExtractFilePathName (resourceStr: AnsiString): AnsiString;
 function findDiskWad (fname: AnsiString): AnsiString;
 
 
+var
+  wadoptDebug: Boolean = false;
+  wadoptFast: Boolean = false;
+
+
 implementation
 
 uses
-  SysUtils, Classes, BinEditor, e_log, g_options, utils, MAPSTRUCT;
+  SysUtils, Classes{, BinEditor}, e_log{, g_options}, utils, MAPSTRUCT;
 
 
 function findDiskWad (fname: AnsiString): AnsiString;
@@ -135,7 +155,11 @@ begin
     if (lastSlash < 0) and (resourceStr[f] = '\') or (resourceStr[f] = '/') then lastSlash := f;
     if resourceStr[f] = ':' then
     begin
-      if lastSlash > 0 then result := normSlashes(Copy(resourceStr, f, lastSlash-f));
+      if lastSlash > 0 then
+      begin
+        result := normSlashes(Copy(resourceStr, f, lastSlash-f));
+        while (length(result) > 0) and (result[1] = '/') do Delete(result, 1, 1);
+      end;
       exit;
     end;
   end;
@@ -170,9 +194,12 @@ begin
     if resourceStr[f] = ':' then
     begin
       result := normSlashes(Copy(resourceStr, f+1, length(resourceStr)));
+      while (length(result) > 0) and (result[1] = '/') do Delete(result, 1, 1);
       exit;
     end;
   end;
+  result := normSlashes(resourceStr);
+  while (length(result) > 0) and (result[1] = '/') do Delete(result, 1, 1);
 end;
 
 
@@ -304,19 +331,21 @@ begin
       if wantMap then
       begin
         goodMap := false;
-        e_WriteLog(Format('DFWAD: checking for good map in wad [%s], file [%s] (#%d)', [fFileName, fi.fname, f]), MSG_NOTIFY);
+        //e_WriteLog(Format('DFWAD: checking for good map in wad [%s], file [%s] (#%d)', [fFileName, fi.fname, f]), MSG_NOTIFY);
         try
           fs.readBuffer(sign, 3);
           goodMap := (sign = MAP_SIGNATURE);
+          {
           if goodMap then
             e_WriteLog(Format('  GOOD map in wad [%s], file [%s] (#%d)', [fFileName, fi.fname, f]), MSG_NOTIFY)
           else
             e_WriteLog(Format('  BAD map in wad [%s], file [%s] (#%d)', [fFileName, fi.fname, f]), MSG_NOTIFY);
+          }
         except
         end;
         if not goodMap then
         begin
-          e_WriteLog(Format('  not a map in wad [%s], file [%s] (#%d)', [fFileName, fi.fname, f]), MSG_NOTIFY);
+          //e_WriteLog(Format('  not a map in wad [%s], file [%s] (#%d)', [fFileName, fi.fname, f]), MSG_NOTIFY);
           fs.Free();
           continue;
         end;
@@ -349,7 +378,7 @@ begin
         end;
         if not goodMap then
         begin
-          e_WriteLog(Format('  not a map in wad [%s], file [%s] (#%d)', [fFileName, fi.fname, f]), MSG_NOTIFY);
+          //e_WriteLog(Format('  not a map in wad [%s], file [%s] (#%d)', [fFileName, fi.fname, f]), MSG_NOTIFY);
           FreeMem(pData);
           pData := nil;
           Len := 0;
@@ -359,7 +388,7 @@ begin
 {$ENDIF}
       result := true;
       {$IFDEF SFS_DWFAD_DEBUG}
-      if gSFSDebug then
+      if wadoptDebug then
         e_WriteLog(Format('DFWAD: file [%s] FOUND in [%s]; size is %d bytes', [name, fFileName, Len]), MSG_NOTIFY);
       {$ENDIF}
       exit;
@@ -391,7 +420,7 @@ begin
     fi := fIter.Files[f];
     if fi = nil then continue;
     if length(fi.name) = 0 then continue;
-    e_WriteLog(Format('DFWAD: checking for map in wad [%s], file [%s] (#%d)', [fFileName, fi.fname, f]), MSG_NOTIFY);
+    //e_WriteLog(Format('DFWAD: checking for map in wad [%s], file [%s] (#%d)', [fFileName, fi.fname, f]), MSG_NOTIFY);
     if isMapResource(f) then
     begin
       s := removeExt(fi.name);
@@ -427,11 +456,11 @@ begin
     exit;
   end;
   {$IFDEF SFS_DWFAD_DEBUG}
-  if gSFSDebug then e_WriteLog(Format('TWADFile.ReadFile: FOUND [%s]', [rfn]), MSG_NOTIFY);
+  if wadoptDebug then e_WriteLog(Format('TWADFile.ReadFile: FOUND [%s]', [rfn]), MSG_NOTIFY);
   {$ENDIF}
   // cache this wad
   try
-    if gSFSFastMode then
+    if wadoptFast then
     begin
       if not SFSAddDataFile(rfn, true) then exit;
     end
@@ -446,7 +475,7 @@ begin
   if fIter = nil then Exit;
   fFileName := rfn;
   {$IFDEF SFS_DWFAD_DEBUG}
-  if gSFSDebug then e_WriteLog(Format('TWADFile.ReadFile: [%s] opened', [fFileName]), MSG_NOTIFY);
+  if wadoptDebug then e_WriteLog(Format('TWADFile.ReadFile: [%s] opened', [fFileName]), MSG_NOTIFY);
   {$ENDIF}
   Result := True;
 end;