X-Git-Url: https://deadsoftware.ru/gitweb?p=d2df-editor.git;a=blobdiff_plain;f=src%2Feditor%2Ff_addresource.pas;h=edca4ed817570b631ebabe9260132922159974da;hp=60fd18f3e452366f8c8fed8d66a2a4835eba845f;hb=b5f9c55a34f89cc238eedc5f0c2620a2d8ba6687;hpb=212386359ea0af4e0a861f9bf92c45a1516ac87c diff --git a/src/editor/f_addresource.pas b/src/editor/f_addresource.pas index 60fd18f..edca4ed 100644 --- a/src/editor/f_addresource.pas +++ b/src/editor/f_addresource.pas @@ -1,6 +1,6 @@ unit f_addresource; -{$MODE Delphi} +{$INCLUDE ../shared/a_modes.inc} interface @@ -45,7 +45,7 @@ var implementation uses - f_main, WADSTRUCT, g_language; + f_main, WADSTRUCT, g_language, utils; {$R *.lfm} @@ -132,7 +132,7 @@ begin 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; @@ -160,7 +160,7 @@ begin WAD.ReadFile(FileName); if cbSectionsList.Text <> '..' then - SectionName := cbSectionsList.Text + SectionName := utf2win(cbSectionsList.Text) else SectionName := ''; @@ -173,7 +173,7 @@ begin 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); @@ -194,14 +194,14 @@ begin 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