X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Feditor%2Ff_packmap.pas;h=a8ad07a7eecc8b9120c3e4d9d6f7512b71c793d9;hb=2789c629b21057292614b015b9a03595bab89c2f;hp=fbfe4735001a57e21e74bfefbefb5bf5ccb47d80;hpb=c0428d85795e63600466f089c35e70bc66d9b5c2;p=d2df-editor.git diff --git a/src/editor/f_packmap.pas b/src/editor/f_packmap.pas index fbfe473..a8ad07a 100644 --- a/src/editor/f_packmap.pas +++ b/src/editor/f_packmap.pas @@ -80,7 +80,7 @@ begin if filename = '' then g_GetResourceSection(OpenedMap, filename, us, un) else - filename := EditorDir + 'wads/' + filename; + filename := WadsDir + DirectorySeparator + filename; e_WriteLog('ProcessResource: "' + wad_to + '" "' + section_to + '" "' + filename + '" "' + section + '" "' + resource + '"', MSG_NOTIFY); if resource = '' then Exit; @@ -99,8 +99,8 @@ begin end else begin - //MessageBox(0, PChar(Format(_lc[I_MSG_WAD_ERROR], [ExtractFileName(filename)])), PChar(_lc[I_MSG_ERROR]), MB_OK + MB_ICONERROR); - 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(_lc[I_MSG_WAD_ERROR], [ExtractFileName(filename)])), PChar(_lc[I_MSG_ERROR]), MB_OK + MB_ICONERROR); + Application.MessageBox(PChar(Format(_lc[I_MSG_RES_ERROR], [filename, section, resource])), PChar(_lc[I_MSG_ERROR]), MB_OK + MB_ICONERROR); Result := False end end; @@ -314,7 +314,7 @@ end; procedure TPackMapForm.FormCreate(Sender: TObject); begin - SaveDialog.InitialDir := EditorDir; + SaveDialog.InitialDir := MapsDir; end; end.