X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Feditor%2FEditor.lpr;h=eaf830dd4e54b85042be85b1135bac2548d14ead;hb=4cd27745126226e5e57a02f4c2a44ccbab16bbac;hp=421a095601225ce80cbc610fc7e1f90fd9b0f996;hpb=7bc9ae2fc0204a6412aa1cb5f05f0ffa8d1870ac;p=d2df-editor.git diff --git a/src/editor/Editor.lpr b/src/editor/Editor.lpr index 421a095..eaf830d 100644 --- a/src/editor/Editor.lpr +++ b/src/editor/Editor.lpr @@ -3,6 +3,9 @@ program Editor; {$INCLUDE ../shared/a_modes.inc} uses + {$IFDEF DARWIN} + MacOSAll, CocoaAll, + {$ENDIF} Forms, Interfaces, Dialogs, GL, GLExt, SysUtils, e_graphics in '../engine/e_graphics.pas', @@ -15,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}, @@ -41,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, @@ -52,8 +48,8 @@ uses ImagingTypes, Imaging, ImagingUtility, - g_language in 'g_language.pas', - f_selectlang in 'f_selectlang.pas' {SelectLanguageForm}; + g_options in 'g_options.pas', + g_language in 'g_language.pas'; {$IFDEF WINDOWS} {$R *.res} @@ -68,6 +64,27 @@ uses LogFileName: AnsiString = ''; ParamFileIndex: Integer = 1; +{$IFDEF DARWIN} + function NSStringToAnsiString (s: NSString): AnsiString; + var i: Integer; + begin + result := ''; + for i := 0 to s.length - 1 do + result := result + AnsiChar(s.characterAtIndex(i)); + end; + + function GetBundlePath (): AnsiString; + var pathRef: CFURLRef; pathCFStr: CFStringRef; pathStr: ShortString; + begin + pathRef := CFBundleCopyBundleURL(CFBundleGetMainBundle()); + pathCFStr := CFURLCopyFileSystemPath(pathRef, kCFURLPOSIXPathStyle); + CFStringGetPascalString(pathCFStr, @pathStr, 255, CFStringGetSystemEncoding()); + CFRelease(pathRef); + CFRelease(pathCFStr); + Result := pathStr; + end; +{$ENDIF} + procedure THandlerObject.ExceptionHandler (Sender: TObject; e: Exception); begin e_WriteStackTrace(e.message); @@ -88,6 +105,46 @@ uses Inc(i); LogFileName := ParamStr(i); end; + end + else if p = '--config' then + begin + if i + 1 <= ParamCount then + begin + Inc(i); + CfgFileName := ParamStr(i); + end; + end + else if p = '--game-wad' then + begin + if i + 1 <= ParamCount then + begin + Inc(i); + GameWad := ParamStr(i); + end; + end + else if p = '--editor-wad' then + begin + if i + 1 <= ParamCount then + begin + Inc(i); + EditorWad := ParamStr(i); + end; + end + else if p = '--wads-dir' then + begin + if i + 1 <= ParamCount then + begin + 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; @@ -95,24 +152,62 @@ uses end; procedure CheckParamFiles; - var i: Integer; path: AnsiString; + var i: Integer; begin i := ParamFileIndex; if i <= ParamCount then - begin - path := ParamStr(i); - if path <> '' then - OpenMap(path, ''); - end; + StartMap := ParamStr(i); end; - procedure InitLogs; + procedure InitPathes; + {$IFDEF DARWIN} + var BundlePath, DFPath, DocPath: AnsiString; ns: NSString; + var ApplicationSupportDirs, DocumentDirs: NSArray; + var count: Integer; + {$ELSE} + var EditorDir: AnsiString; + {$ENDIF} begin - if LogFileName = '' then - LogFileName := 'Editor.log'; + {$IFDEF DARWIN} + BundlePath := GetBundlePath(); + ApplicationSupportDirs := NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, true); + count := ApplicationSupportDirs.count; + ns := ApplicationSupportDirs.objectAtIndex(count - 1); + DFPath := NSStringToAnsiString(ns) + DirectorySeparator + 'Doom 2D Forever'; + DocumentDirs := NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, true); + count := DocumentDirs.count; + ns := DocumentDirs.objectAtIndex(count - 1); + DocPath := NSStringToAnsiString(ns) + DirectorySeparator + 'Doom 2D Forever'; + GameExeFile := 'Doom 2D Forever.app'; + CfgFileName := DFPath + DirectorySeparator + 'Editor.cfg'; + 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} + EditorDir := ExtractFilePath(Application.ExeName); + {$IFDEF WINDOWS} + GameExeFile := 'Doom2DF.exe'; + {$ELSE} + GameExeFile := 'Doom2DF'; + {$ENDIF} + CfgFileName := EditorDir + DirectorySeparator + 'Editor.cfg'; + 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} + ForceDirectories(MapsDir); + ForceDirectories(WadsDir); + end; - if LogFileName <> '' then - e_InitLog(LogFileName, WM_NEWFILE); + procedure InitLogs; + begin + e_InitLog(LogFileName, WM_NEWFILE); {$IF DECLARED(UseHeapTrace)} (* http://wiki.freepascal.org/heaptrc *) @@ -120,13 +215,28 @@ uses //SetHeapTraceOutput('EditorLeaks.log'); //HaltOnError := False; {$ENDIF} + + e_WriteLog('Used file pathes:', MSG_NOTIFY); + e_WriteLog(' GameExeFile = ' + GameExeFile, MSG_NOTIFY); + e_WriteLog(' CfgFileName = ' + CfgFileName, 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; 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; InitLogs; @@ -146,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;