index bf3965687da05c7e7564592291a47d6420ef102c..911700b7df8a5f18cf6aaee493d5cd6371b4546b 100644 (file)
--- a/src/editor/f_packmap.pas
+++ b/src/editor/f_packmap.pas
uses
BinEditor, WADEDITOR, g_map, MAPREADER, MAPWRITER, MAPSTRUCT,
- f_main, math, g_language;
+ f_main, math, g_language, g_options, e_log;
{$R *.lfm}
procedure TPackMapForm.bSelectWADClick(Sender: TObject);
begin
- SaveDialog.Filter := _lc[I_FILE_FILTER_WAD];
+ SaveDialog.Filter := MsgFileFilterWad;
if SaveDialog.Execute() then
eWAD.Text := SaveDialog.FileName;
end;
-function ProcessResource(wad_to: TWADEditor_1;
- section_to, filename, section, resource: String): Boolean;
+function ProcessResource(wad_to: TWADEditor_1; section_to, filename, section, resource: String): Boolean;
var
wad2: TWADEditor_1;
data: Pointer;
begin
Result := False;
-
+
if filename = '' then
g_ProcessResourceStr(OpenedMap, @filename, nil, nil)
else
- filename := EditorDir+'wads/'+filename;
+ filename := WadsDir + DirectorySeparator + filename;
// Читаем ресурс из WAD-файла карты или какого-то другого:
wad2 := TWADEditor_1.Create();
if not wad2.ReadFile(filename) then
begin
- MessageBox(0, PChar(Format(_lc[I_MSG_WAD_ERROR],
- [ExtractFileName(filename)])),
- PChar(_lc[I_MSG_ERROR]), MB_OK + MB_ICONERROR);
+ Application.MessageBox(PChar(Format(MsgMsgWadError, [ExtractFileName(filename)])), PChar(MsgMsgError), MB_OK + MB_ICONERROR);
wad2.Free();
Exit;
end;
if not wad2.GetResource(utf2win(section), utf2win(resource), data, reslen) then
begin
- MessageBox(0, PChar(Format(_lc[I_MSG_RES_ERROR],
- [filename, section, resource])),
- PChar(_lc[I_MSG_ERROR]), MB_OK + MB_ICONERROR);
+ Application.MessageBox(PChar(Format(MsgMsgResError, [filename, section, resource])), PChar(MsgMsgError), MB_OK + MB_ICONERROR);
wad2.Free();
Exit;
end;
mr.Free();
WAD.Free();
- MessageDlg(Format(_lc[I_MSG_PACKED],
- [eResource.Text, ExtractFileName(eWAD.Text)]),
- mtInformation, [mbOK], 0);
-
+ MessageDlg(Format(MsgMsgPacked, [eResource.Text, ExtractFileName(eWAD.Text)]), mtInformation, [mbOK], 0);
Close();
end;
procedure TPackMapForm.FormCreate(Sender: TObject);
begin
- SaveDialog.InitialDir := EditorDir;
+ SaveDialog.InitialDir := MapsDir;
end;
end.