Revert to old wad read/write method

[d2df-editor.git] / src / editor / Editor.lpr

diff --git a/src/editor/Editor.lpr b/src/editor/Editor.lpr
index 2e5585344aa4627e340de55019560340902728e5..eaf830dd4e54b85042be85b1135bac2548d14ead 100644 (file)
--- a/src/editor/Editor.lpr
+++ b/src/editor/Editor.lpr
@@ -18,12 +18,6 @@ uses
   WADEDITOR in '../shared/WADEDITOR.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},
@@ -44,7 +38,6 @@ uses
   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,
@@ -56,8 +49,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}
@@ -145,6 +137,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;
@@ -183,6 +183,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}
@@ -196,6 +197,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}
@@ -220,6 +222,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;
@@ -228,6 +231,10 @@ begin
   Application.ExceptionDialog := aedOkMessageBox;
   Application.AddOnExceptionHandler(THandlerObject.ExceptionHandler, True);
   Application.Initialize();
+  {$IFDEF DARWIN}
+    // Disable icons in menu on OSX by default
+    Application.ShowMenuGlyphs := sbgNever;
+  {$ENDIF}
 
   InitPathes;
   CheckParamOptions;
@@ -249,9 +256,9 @@ begin
   Application.CreateForm(TAddSoundForm, AddSoundForm);
   Application.CreateForm(TSaveMiniMapForm, SaveMiniMapForm);
   Application.CreateForm(TPackMapForm, PackMapForm);
-  Application.CreateForm(TMapTestForm, MapTestForm);
   Application.CreateForm(TChooseTypeForm, ChooseTypeForm);
-  Application.CreateForm(TSelectLanguageForm, SelectLanguageForm);
+
+  g_Language_Set(gLanguage);
 
   CheckParamFiles;