X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-editor.git;a=blobdiff_plain;f=src%2Feditor%2Ff_addresource.pas;h=d67765e20d111ae91e253ee8350953e1a46ff8c4;hp=24c9f8327171b4d2e57bae1a2daf7a8aa1041fe3;hb=a581a1646afd7753ba5c36a68be107d206bab45c;hpb=2bd2bcbe8a077670806a4f97c0ad1213d12162ec diff --git a/src/editor/f_addresource.pas b/src/editor/f_addresource.pas index 24c9f83..d67765e 100644 --- a/src/editor/f_addresource.pas +++ b/src/editor/f_addresource.pas @@ -64,7 +64,7 @@ begin FFullResourceName := ''; FResourceSelected := False; - if FindFirst(EditorDir + 'wads/*.*', faAnyFile, SR) = 0 then + if FindFirst(WadsDir + DirectorySeparator + '*.*', faAnyFile, SR) = 0 then repeat if (SR.name <> '.') and (SR.name <> '..') then cbWADList.Items.Add(SR.Name); @@ -108,7 +108,7 @@ procedure TAddResourceForm.cbWADListChange(Sender: TObject); FileName, Section, sn, rn: String; begin if cbWADList.Text <> _lc[I_WAD_SPECIAL_MAP] then - FileName := EditorDir + 'wads/' + cbWADList.Text (* Resource wad *) + FileName := WadsDir + DirectorySeparator + cbWADList.Text (* Resource wad *) else g_ProcessResourceStr(OpenedMap, FileName, sn, rn); (* Map wad *) @@ -138,7 +138,7 @@ procedure TAddResourceForm.cbSectionsListChange(Sender: TObject); FileName, Section, SectionName, sn, rn: String; begin if cbWADList.Text <> _lc[I_WAD_SPECIAL_MAP] then - FileName := EditorDir + 'wads/' + cbWADList.Text (* Resource wad *) + FileName := WadsDir + DirectorySeparator + cbWADList.Text (* Resource wad *) else g_ProcessResourceStr(OpenedMap, FileName, sn, rn); (* Map wad *) @@ -179,7 +179,7 @@ begin g_ProcessResourceStr(OpenedMap, @fn, nil, nil); if FileName <> '' then - FFullResourceName := EditorDir + 'wads/' + FResourceName + FFullResourceName := WadsDir + DirectorySeparator + FResourceName else FFullResourceName := fn + FResourceName end;