X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Feditor%2FEditor.lpr;h=6bf0b86243c94bff222999756e0d4db8bde52f4a;hb=ec98030d700c2f716bbf600ac4f6e30ad35d26be;hp=1246516f954c714d0183b4f35976c14c6915ced7;hpb=aac9a5a0163636f33249acf6ce27ea770818c6cb;p=d2df-editor.git

diff --git a/src/editor/Editor.lpr b/src/editor/Editor.lpr
index 1246516..6bf0b86 100644
--- a/src/editor/Editor.lpr
+++ b/src/editor/Editor.lpr
@@ -55,8 +55,7 @@ uses
   Imaging,
   ImagingUtility,
   g_options in 'g_options.pas',
-  g_language in 'g_language.pas',
-  f_selectlang in 'f_selectlang.pas' {SelectLanguageForm};
+  g_language in 'g_language.pas';
 
 {$IFDEF WINDOWS}
   {$R *.res}
@@ -144,6 +143,14 @@ uses
           Inc(i);
           WadsDir := ParamStr(i);
         end;
+      end
+      else if p = '--lang-dir' then
+      begin
+        if i + 1 <= ParamCount then
+        begin
+          Inc(i);
+          LangDir := ParamStr(i);
+        end;
       end;
       Inc(i);
     end;
@@ -182,6 +189,7 @@ uses
       LogFileName := DFPath + DirectorySeparator + 'Editor.log';
       MapsDir := DocPath + DirectorySeparator + 'Maps';
       WadsDir := BundlePath + DirectorySeparator + 'Contents' + DirectorySeparator + 'Resources' + DirectorySeparator + 'wads';
+      LangDIr := BundlePath + DirectorySeparator + 'Contents' + DirectorySeparator + 'Resources' + DirectorySeparator + 'data' + DirectorySeparator + 'lang';
       GameWad := BundlePath + DirectorySeparator + 'Contents' + DirectorySeparator + 'Resources' + DirectorySeparator + 'data' + DirectorySeparator + 'game.wad';
       EditorWad := BundlePath + DirectorySeparator + 'Contents' + DirectorySeparator + 'Resources' + DirectorySeparator + 'data' + DirectorySeparator + 'editor.wad';
     {$ELSE}
@@ -195,6 +203,7 @@ uses
       LogFileName := EditorDir + DirectorySeparator + 'Editor.log';
       MapsDir := EditorDir + DirectorySeparator + 'maps';
       WadsDir := EditorDir + DirectorySeparator + 'wads';
+      LangDir := EditorDir + DirectorySeparator + 'data' + DirectorySeparator + 'lang';
       GameWad := EditorDir + DirectorySeparator + 'data' + DirectorySeparator + 'game.wad';
       EditorWad := EditorDir + DirectorySeparator + 'data' + DirectorySeparator + 'editor.wad';
     {$ENDIF}
@@ -219,6 +228,7 @@ uses
     e_WriteLog('  LogFileName = ' + LogFileName, MSG_NOTIFY);
     e_WriteLog('  MapsDir     = ' + MapsDir, MSG_NOTIFY);
     e_WriteLog('  WadsDir     = ' + WadsDir, MSG_NOTIFY);
+    e_WriteLog('  LangDir     = ' + LangDir, MSG_NOTIFY);
     e_WriteLog('  GameWad     = ' + GameWad, MSG_NOTIFY);
     e_WriteLog('  EditorWad   = ' + EditorWad, MSG_NOTIFY);
   end;
@@ -253,7 +263,8 @@ begin
   Application.CreateForm(TSaveMiniMapForm, SaveMiniMapForm);
   Application.CreateForm(TPackMapForm, PackMapForm);
   Application.CreateForm(TChooseTypeForm, ChooseTypeForm);
-  Application.CreateForm(TSelectLanguageForm, SelectLanguageForm);
+
+  g_Language_Set(gLanguage);
 
   CheckParamFiles;