diff --git a/src/editor/Editor.lpr b/src/editor/Editor.lpr
index 95692d90bcb0c49d5f78d449012caca91cb929c3..6075985572aae62daca44d25c619d72710d335e5 100644 (file)
--- a/src/editor/Editor.lpr
+++ b/src/editor/Editor.lpr
MAPWRITER in '../shared/MAPWRITER.pas',
MAPDEF in '../shared/MAPDEF.pas',
WADEDITOR in '../shared/WADEDITOR.pas',
MAPWRITER in '../shared/MAPWRITER.pas',
MAPDEF in '../shared/MAPDEF.pas',
WADEDITOR in '../shared/WADEDITOR.pas',
+ WADEDITOR_dfwad in '../shared/WADEDITOR_dfwad.pas',
+ WADEDITOR_dfzip in '../shared/WADEDITOR_dfzip.pas',
WADSTRUCT in '../shared/WADSTRUCT.pas',
CONFIG in '../shared/CONFIG.pas',
WADSTRUCT in '../shared/WADSTRUCT.pas',
CONFIG in '../shared/CONFIG.pas',
- xstreams in '../shared/xstreams.pas',
- dfzip in '../shared/dfzip.pas',
- sfs in '../sfs/sfs.pas',
- sfsPlainFS in '../sfs/sfsPlainFS.pas',
- sfsZipFS in '../sfs/sfsZipFS.pas',
-
f_about in 'f_about.pas' {AboutForm},
f_options in 'f_options.pas' {OptionsForm},
f_main in 'f_main.pas' {MainForm},
f_about in 'f_about.pas' {AboutForm},
f_options in 'f_options.pas' {OptionsForm},
f_main in 'f_main.pas' {MainForm},
spectrum in 'spectrum.pas',
f_saveminimap in 'f_saveminimap.pas' {SaveMiniMapForm},
f_packmap in 'f_packmap.pas' {PackMapForm},
spectrum in 'spectrum.pas',
f_saveminimap in 'f_saveminimap.pas' {SaveMiniMapForm},
f_packmap in 'f_packmap.pas' {PackMapForm},
- f_maptest in 'f_maptest.pas' {MapTestForm},
f_choosetype in 'f_choosetype.pas' {ChooseTypeForm},
{$IFNDEF NOSOUND}
fmod,
f_choosetype in 'f_choosetype.pas' {ChooseTypeForm},
{$IFNDEF NOSOUND}
fmod,
Imaging,
ImagingUtility,
g_options in 'g_options.pas',
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}
{$IFDEF WINDOWS}
{$R *.res}
Inc(i);
WadsDir := ParamStr(i);
end;
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;
end;
Inc(i);
end;
LogFileName := DFPath + DirectorySeparator + 'Editor.log';
MapsDir := DocPath + DirectorySeparator + 'Maps';
WadsDir := BundlePath + DirectorySeparator + 'Contents' + DirectorySeparator + 'Resources' + DirectorySeparator + 'wads';
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}
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';
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}
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(' 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;
e_WriteLog(' GameWad = ' + GameWad, MSG_NOTIFY);
e_WriteLog(' EditorWad = ' + EditorWad, MSG_NOTIFY);
end;
Application.CreateForm(TAddSoundForm, AddSoundForm);
Application.CreateForm(TSaveMiniMapForm, SaveMiniMapForm);
Application.CreateForm(TPackMapForm, PackMapForm);
Application.CreateForm(TAddSoundForm, AddSoundForm);
Application.CreateForm(TSaveMiniMapForm, SaveMiniMapForm);
Application.CreateForm(TPackMapForm, PackMapForm);
- Application.CreateForm(TMapTestForm, MapTestForm);
Application.CreateForm(TChooseTypeForm, ChooseTypeForm);
Application.CreateForm(TChooseTypeForm, ChooseTypeForm);
- Application.CreateForm(TSelectLanguageForm, SelectLanguageForm);
+
+ g_Language_Set(gLanguage);
CheckParamFiles;
CheckParamFiles;