diff --git a/src/editor/Editor.lpr b/src/editor/Editor.lpr
index 1246516f954c714d0183b4f35976c14c6915ced7..1ca2d20f5378c543ada9d7d268f207fec2b88100 100644 (file)
--- a/src/editor/Editor.lpr
+++ b/src/editor/Editor.lpr
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}
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}
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}
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;
Application.CreateForm(TSaveMiniMapForm, SaveMiniMapForm);
Application.CreateForm(TPackMapForm, PackMapForm);
Application.CreateForm(TChooseTypeForm, ChooseTypeForm);
- Application.CreateForm(TSelectLanguageForm, SelectLanguageForm);
+
+ g_Language_Set(gLanguage);
CheckParamFiles;