index 343c92f684fe81ba28ece6a79e502db30675e3da..252075fac9b76aae2c7a4fc614c77221c35cf015 100644 (file)
--- a/src/shared/wadreader.pas
+++ b/src/shared/wadreader.pas
result := '';
if not findFileCI(fname) then
begin
- //e_WriteLog(Format('TWADFile.ReadFile: error looking for [%s] [%s]', [path, ExtractFileName(fname)]), MSG_NOTIFY);
+ //e_WriteLog(Format('findDiskWad: error looking for [%s]', [fname]), MSG_NOTIFY);
if StrEquCI1251(ExtractFileExt(fname), '.wad') then
begin
- fname := ChangeFileExt(ExtractFileName(fname), '.pk3');
- //e_WriteLog(Format(' looking for [%s] [%s]', [path, rfn]), MSG_NOTIFY);
+ fname := ChangeFileExt(fname, '.pk3');
+ //e_WriteLog(Format(' looking for [%s]', [fname]), MSG_NOTIFY);
if not findFileCI(fname) then
begin
- //e_WriteLog(Format(' looking for [%s] [%s]', [path, rfn]), MSG_NOTIFY);
- fname := ChangeFileExt(ExtractFileName(fname), '.zip');
+ fname := ChangeFileExt(fname, '.zip');
+ //e_WriteLog(Format(' looking for [%s]', [fname]), MSG_NOTIFY);
if not findFileCI(fname) then exit;
end;
end
begin
exit;
end;
- //e_WriteLog(Format('TWADFile.ReadFile: FOUND [%s]', [rfn]), MSG_NOTIFY);
- end
- else
- begin
- //if rfn <> ExtractFileName(FileName) then e_WriteLog(Format('TWADFile.ReadFile: FOUND [%s]', [rfn]), MSG_NOTIFY);
end;
+ //e_WriteLog(Format('findDiskWad: FOUND [%s]', [fname]), MSG_NOTIFY);
result := fname;
end;