X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fshared%2Futils.pas;h=a854ca45bc922f155465ed98a32daad0710ced8c;hp=5cd2af8831b8e7a1673338b1895691610f7f463a;hb=75125c8752adeb3dc9e2ea3841b3b64dc23268ce;hpb=0bec5f3ff1adfc8b355643e2c527418c4eed858b

diff --git a/src/shared/utils.pas b/src/shared/utils.pas
index 5cd2af8..a854ca4 100644
--- a/src/shared/utils.pas
+++ b/src/shared/utils.pas
@@ -104,6 +104,8 @@ function findFileCI (var pathname: AnsiString; lastIsDir: Boolean=false): Boolea
 
 // return fixed AnsiString or empty AnsiString
 function findDiskWad (fname: AnsiString): AnsiString;
+// slashes must be normalized!
+function isWadNamesEqu (wna, wnb: AnsiString): Boolean;
 
 // they throws
 function openDiskFileRO (pathname: AnsiString): TStream;
@@ -1148,6 +1150,28 @@ end;
 
 const fileExtensions: array [0..6] of AnsiString = ('.dfz', '.wad', '.dfwad', '.pk3', '.pak', '.zip', '.dfzip');
 
+function isWadNamesEqu (wna, wnb: AnsiString): Boolean;
+var
+  ext, newExt: AnsiString;
+  found: Boolean;
+begin
+  result := StrEquCI1251(wna, wnb);
+  if result then exit;
+  // check first ext
+  ext := getFilenameExt(wna);
+  found := false;
+  for newExt in fileExtensions do if (StrEquCI1251(ext, newExt)) then begin found := true; break; end;
+  if not found then exit;
+  // check second ext
+  ext := getFilenameExt(wnb);
+  found := false;
+  for newExt in fileExtensions do if (StrEquCI1251(ext, newExt)) then begin found := true; break; end;
+  if not found then exit;
+  wna := forceFilenameExt(wna, '');
+  wnb := forceFilenameExt(wnb, '');
+  result := StrEquCI1251(wna, wnb);
+end;
+
 function findDiskWad (fname: AnsiString): AnsiString;
 var
   origExt: AnsiString = '';