index 71e1c1d6a11049ce166fda9a1c76385721b710a8..edca4ed817570b631ebabe9260132922159974da 100644 (file)
unit f_addresource;
-{$MODE Delphi}
+{$INCLUDE ../shared/a_modes.inc}
interface
implementation
uses
- f_main, WADSTRUCT, g_language;
+ f_main, WADSTRUCT, g_language, utils;
{$R *.lfm}
FResourceSelected := False;
ChDir(EditorDir);
- if FindFirst(EditorDir+'wads\*.wad', faAnyFile, SR) = 0 then
+ if FindFirst(EditorDir+'wads/*.wad', faAnyFile, SR) = 0 then
repeat
cbWADList.Items.Add(SR.Name);
until FindNext(SR) <> 0;
// Внешний WAD:
if cbWADList.Text <> _lc[I_WAD_SPECIAL_MAP] then
- FileName := EditorDir+'wads\'+cbWADList.Text
+ FileName := EditorDir+'wads/'+cbWADList.Text
else // WAD карты:
begin
g_ProcessResourceStr(OpenedMap, fn, sn, rn);
if SectionList <> nil then
for i := 0 to High(SectionList) do
if SectionList[i] <> '' then
- cbSectionsList.Items.Add(SectionList[i])
+ cbSectionsList.Items.Add(win2utf(SectionList[i]))
else
cbSectionsList.Items.Add('..');
end;
// Внешний WAD:
if cbWADList.Text <> _lc[I_WAD_SPECIAL_MAP] then
- FileName := EditorDir+'wads\'+cbWADList.Text
+ FileName := EditorDir+'wads/'+cbWADList.Text
else // WAD карты:
begin
g_ProcessResourceStr(OpenedMap, fn, sn, rn);
WAD.ReadFile(FileName);
if cbSectionsList.Text <> '..' then
- SectionName := cbSectionsList.Text
+ SectionName := utf2win(cbSectionsList.Text)
else
SectionName := '';
if ResourceList <> nil then
for i := 0 to High(ResourceList) do
- lbResourcesList.Items.Add(ResourceList[i]);
+ lbResourcesList.Items.Add(win2utf(ResourceList[i]));
end;
procedure TAddResourceForm.lbResourcesListClick(Sender: TObject);
if cbSectionsList.Text = '..' then
SectionName := ''
else
- SectionName := cbSectionsList.Text;
+ SectionName := utf2win(cbSectionsList.Text);
if cbWADList.Text[1] <> '<' then
FileName := cbWADList.Text
else
FileName := '';
- FResourceName := FileName+':'+SectionName+'\'+lbResourcesList.Items[lbResourcesList.ItemIndex];
+ FResourceName := FileName+':'+SectionName+'\'+utf2win(lbResourcesList.Items[lbResourcesList.ItemIndex]);
if FileName <> '' then
- FFullResourceName := EditorDir+'wads\'+FResourceName
+ FFullResourceName := EditorDir+'wads/'+FResourceName
else
begin
g_ProcessResourceStr(OpenedMap, @fn, nil, nil);