summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7dd0f05)
raw | patch | inline | side by side (parent: 7dd0f05)
author | DeaDDooMER <deaddoomer@deadsoftware.ru> | |
Wed, 16 Jan 2019 14:41:40 +0000 (17:41 +0300) | ||
committer | DeaDDooMER <deaddoomer@deadsoftware.ru> | |
Wed, 16 Jan 2019 14:41:40 +0000 (17:41 +0300) |
src/game/g_menu.pas | patch | blob | history | |
src/sfs/sfsZipFS.pas | patch | blob | history | |
src/shared/utils.pas | patch | blob | history |
diff --git a/src/game/g_menu.pas b/src/game/g_menu.pas
index 6265eeb2d69ce0abf6cbc5cb03d1f72523e3619a..1b33864f7f606bda8e8325b4718756c9b412ce13 100644 (file)
--- a/src/game/g_menu.pas
+++ b/src/game/g_menu.pas
Sort := True;
Dirs := True;
- FileMask := '*.wad|*.pk3|*.zip';
+ FileMask := '*.wad|*.pk3|*.zip|*.dfz';
SetBase(MapsDir+'megawads/');
end;
Sort := True;
Dirs := True;
- FileMask := '*.wad|*.pk3|*.zip';
+ FileMask := '*.wad|*.pk3|*.zip|*.dfz';
SetBase(MapsDir);
end;
with AddList(_lc[I_MENU_MAP_RESOURCE], 12, 4) do
diff --git a/src/sfs/sfsZipFS.pas b/src/sfs/sfsZipFS.pas
index 2cc9eff2e8f439d0f7ddad9be10081417650b721..e5e996841f803b4888dddd5a8467e5105ded8196 100644 (file)
--- a/src/sfs/sfsZipFS.pas
+++ b/src/sfs/sfsZipFS.pas
result :=
StrEquCI1251(prefix, 'zip') or
StrEquCI1251(prefix, 'pk3') or
+ StrEquCI1251(prefix, 'dfz') or
StrEquCI1251(prefix, 'dfwad') or
StrEquCI1251(prefix, 'dfzip');
end;
diff --git a/src/shared/utils.pas b/src/shared/utils.pas
index 09c03548a45b04a5bc8809e820fa9ec8b7aebcd2..16006052e826e21e09f2f0cdfd1cc3247f095864 100644 (file)
--- a/src/shared/utils.pas
+++ b/src/shared/utils.pas
ext: AnsiString;
begin
ext := getFilenameExt(fn);
- result := StrEquCI1251(ext, '.wad') or StrEquCI1251(ext, '.pk3') or StrEquCI1251(ext, '.zip');
+ result := StrEquCI1251(ext, '.wad') or StrEquCI1251(ext, '.pk3') or StrEquCI1251(ext, '.zip') or StrEquCI1251(ext, '.dfz');
end;
if (pos-4 > 1) and (fn[pos-4] = '.') and ((fn[pos+1] = '\') or (fn[pos+1] = '/')) then
begin
s := Copy(fn, pos-4, 4);
- if StrEquCI1251(s, '.wad') or StrEquCI1251(s, '.pk3') or StrEquCI1251(s, '.zip') then
+ if StrEquCI1251(s, '.wad') or StrEquCI1251(s, '.pk3') or StrEquCI1251(s, '.zip') or StrEquCI1251(s, '.dfz') then
begin
result := true;
exit;
end;
-const fileExtensions: array [0..5] of AnsiString = ('.wad', '.dfzip', '.dfwad', '.pk3', '.pak', '.zip');
+const fileExtensions: array [0..6] of AnsiString = ('.wad', '.dfzip', '.dfwad', '.pk3', '.pak', '.zip', '.dfz');
function findDiskWad (fname: AnsiString): AnsiString;
var