diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 24dac52e2e76556c340db9ddd3595c1ec67d1370..94606737be95baed9247cbfe82d29f4ca792af2a 100644 (file)
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
var
{--- TO REMOVE ---}
- GameDir: string;
+ //GameDir: string;
{-----------------}
{--- Read-only dirs ---}
{$INCLUDE ../nogl/noGLuses.inc}
{$IFDEF ENABLE_HOLMES}
g_holmes, sdlcarcass, fui_ctls, fui_wadread, fui_style, fui_gfx_gl,
+{$ENDIF}
+{$IFDEF LINUX}
+ BaseUnix,
+{$ENDIF}
+{$IFDEF USE_SDL2}
+ SDL2,
{$ENDIF}
wadreader, e_log, g_window,
e_graphics, e_input, g_game, g_console, g_gui,
var
charbuff: packed array [0..15] of AnsiChar;
+ binPath: AnsiString = '';
+ forceCurrentDir: Boolean = false;
+
+
+function GetBinaryPath (): AnsiString;
+{$IFDEF LINUX}
+var
+ //cd: AnsiString;
+ sl: AnsiString;
+{$ENDIF}
+begin
+ result := ExtractFilePath(ParamStr(0));
+ {$IFDEF LINUX}
+ // it may be a symlink; do some guesswork here
+ sl := fpReadLink(ExtractFileName(ParamStr(0)));
+ if (sl = ParamStr(0)) then
+ begin
+ // use current directory, as we don't have anything better
+ //result := '.';
+ GetDir(0, result);
+ end;
+ {$ENDIF}
+ result := fixSlashes(result);
+ if (length(result) > 0) and (result[length(result)] <> '/') then result := result+'/';
+end;
+
+procedure PrintDirs (msg: AnsiString; dirs: SSArray);
+ var dir: AnsiString;
+begin
+ e_LogWriteln(msg + ':');
+ for dir in dirs do
+ e_LogWriteln(' ' + dir);
+end;
procedure InitPath;
- var i: Integer; rwdir, rodir: AnsiString;
+ var i: Integer; rwdir, rodir: AnsiString; rwdirs, rodirs: SSArray;
+ //first: Boolean = true;
- procedure AddPath (var arr: SSArray; str: AnsiString);
+ procedure xput (s: AnsiString);
+ {
+ var
+ f: TextFile;
+ begin
+ AssignFile(f, 'zzz.log');
+ if (first) then
+ begin
+ Rewrite(f);
+ first := false;
+ end
+ else
+ begin
+ Append(f);
+ end;
+ writeln(f, s);
+ CloseFile(f);
+ end;
+ }
begin
- SetLength(arr, Length(arr) + 1);
- arr[High(arr)] := ExpandFileName(str)
end;
- procedure AddDef (var arr: SSArray; str: AnsiString);
+ procedure AddPath (var arr: SSArray; str: AnsiString; usecwd: Boolean=true);
+ var
+ ss: ShortString;
begin
- if arr = nil then
- AddPath(arr, str)
+ if (length(str) = 0) then exit;
+ //writeln('NEW PATH(0): ['+str+']');
+ if (forceCurrentDir or usecwd) then
+ begin
+ str := fixSlashes(ExpandFileName(str));
+ end
+ else
+ begin
+ str := fixSlashes(str);
+ if (not isAbsolutePath(str)) then str := binPath+str;
+ while (length(str) > 0) do
+ begin
+ if (isRootPath(str)) then exit;
+ if (str[length(str)] = '/') then begin Delete(str, length(str), 1); continue; end;
+ if (length(str) >= 2) and (Copy(str, length(str)-1, 2) = '/.') then begin Delete(str, length(str)-1, 2); continue; end;
+ break;
+ end;
+ end;
+ if (length(str) = 0) then exit;
+ if (length(str) > 255) then
+ begin
+ xput('path too long: ['+str+']');
+ raise Exception.Create(Format('path "%s" too long', [str]));
+ end;
+ for ss in arr do
+ begin
+ //writeln('<<<', ss, '>>> : [', str, ']');
+ if (ss = str) then exit;
+ end;
+ SetLength(arr, Length(arr)+1);
+ //arr[High(arr)] := ExpandFileName(str);
+ arr[High(arr)] := str;
+ //writeln('NEW PATH(1): ['+str+']');
+ end;
+
+ procedure AddDef (var dirs: SSArray; base: SSArray; append: AnsiString);
+ var s: AnsiString;
+ begin
+ if Length(dirs) = 0 then
+ for s in base do
+ AddPath(dirs, e_CatPath(s, append), false)
+ end;
+
+ procedure AddDir (var dirs: SSArray; append: AnsiString);
+ begin
+ SetLength(dirs, Length(dirs) + 1);
+ dirs[High(dirs)] := append
+ end;
+
+ function GetDefaultRODirs (): SSArray;
+ {$IFDEF UNIX}
+ var home: AnsiString;
+ {$ENDIF}
+ begin
+ {$IFDEF USE_SDL2}
+ AddDir(result, SDL_GetBasePath());
+ AddDir(result, SDL_GetPrefPath('', 'doom2df'));
+ {$ENDIF}
+ {$IFDEF UNIX}
+ AddDir(result, '/usr/share/doom2df');
+ AddDir(result, '/usr/local/share/doom2df');
+ home := GetEnvironmentVariable('HOME');
+ if home <> '' then
+ AddDir(result, e_CatPath(home, '.doom2df'));
+ {$ENDIF}
+ {$IF DEFINED(ANDROID) AND DEFINED(USE_SDL2)}
+ AddDir(result, SDL_AndroidGetInternalStoragePath());
+ if SDL_AndroidGetExternalStorageState() <> 0 then
+ AddDir(result, SDL_AndroidGetExternalStoragePath());
+ {$ENDIF}
+ AddDir(result, '.');
+ end;
+
+ function GetDefaultRWDirs (): SSArray;
+ {$IFDEF UNIX}
+ var home: AnsiString;
+ {$ENDIF}
+ begin
+ {$IF DEFINED(USE_SDL2)}
+ AddDir(result, SDL_GetPrefPath('', 'doom2df'));
+ {$ENDIF}
+ {$IFDEF UNIX}
+ home := GetEnvironmentVariable('HOME');
+ if home <> '' then
+ AddDir(result, e_CatPath(home, '.doom2df'));
+ {$ENDIF}
+ {$IF DEFINED(ANDROID) AND DEFINED(USE_SDL2)}
+ if SDL_AndroidGetExternalStorageState() <> 0 then
+ AddDir(result, SDL_AndroidGetExternalStoragePath());
+ {$ENDIF}
+ AddDir(result, '.');
end;
begin
- GetDir(0, GameDir);
+ //GetDir(0, GameDir);
+ binPath := GetBinaryPath();
+ xput('binPath=['+binPath+']');
+
+ for i := 1 to ParamCount do
+ begin
+ if (ParamStr(i) = '--cwd') then
+ begin
+ forceCurrentDir := true;
+ break
+ end
+ end;
i := 1;
while i < ParamCount do
end;
(* RO *)
- AddDef(DataDirs, 'data');
- AddDef(ModelDirs, 'data/models');
- AddDef(MegawadDirs, 'maps/megawads');
- AddDef(MapDirs, 'maps');
- AddDef(WadDirs, 'wads');
+ rodirs := GetDefaultRODirs();
+ AddDef(DataDirs, rodirs, 'data');
+ AddDef(ModelDirs, rodirs, 'data/models');
+ AddDef(MegawadDirs, rodirs, 'maps/megawads');
+ AddDef(MapDirs, rodirs, 'maps');
+ AddDef(WadDirs, rodirs, 'wads');
+
(* RW *)
- AddDef(LogDirs, '.');
- AddDef(SaveDirs, 'data');
- AddDef(CacheDirs, 'data/cache');
- AddDef(ConfigDirs, '.');
- AddDef(MapDownloadDirs, 'maps/downloads');
- AddDef(WadDownloadDirs, 'wad/downloads');
- AddDef(ScreenshotDirs, 'screenshots');
+ rwdirs := GetDefaultRWDirs();
+ AddDef(LogDirs, rwdirs, '');
+ AddDef(SaveDirs, rwdirs, 'data');
+ AddDef(CacheDirs, rwdirs, 'data/cache');
+ AddDef(ConfigDirs, rwdirs, '');
+ AddDef(MapDownloadDirs, rwdirs, 'maps/downloads');
+ AddDef(WadDownloadDirs, rwdirs, 'wads/downloads');
+ AddDef(ScreenshotDirs, rwdirs, 'screenshots');
for i := 0 to High(MapDirs) do
AddPath(AllMapDirs, MapDirs[i]);
if LogFileName = '' then
begin
- rwdir := e_GetDir(LogDirs);
+ rwdir := e_GetWriteableDir(LogDirs, false);
if rwdir <> '' then
begin
{$IFDEF HEADLESS}
LogFileName := e_CatPath(rwdir, 'Doom2DF_H.log');
{$ELSE}
- LogFileName := e_Catpath(rwdir, 'Doom2DF.log');
- {$ENDIF}
+ LogFileName := e_CatPath(rwdir, 'Doom2DF.log');
+ {$ENDIF}
end
- end
+ end;
+
+ xput('binPath=['+binPath+']');
end;
-procedure Main();
-{$IFDEF ENABLE_HOLMES}
- var flexloaded: Boolean;
-{$ENDIF}
- var s: AnsiString;
+procedure InitPrep;
+ {$IF DEFINED(ANDROID) AND DEFINED(USE_SDLMIXER)}
+ var timiditycfg: AnsiString;
+ {$ENDIF}
+ var i: Integer;
begin
- InitPath;
+ {$IFDEF HEADLESS}
+ conbufDumpToStdOut := true;
+ {$ENDIF}
+ for i := 1 to ParamCount do
+ begin
+ if (ParamStr(i) = '--con-stdout') then
+ begin
+ conbufDumpToStdOut := true;
+ break
+ end
+ end;
+
if LogFileName <> '' then
e_InitLog(LogFileName, TWriteMode.WM_NEWFILE);
e_InitWritelnDriver();
+ e_WriteLog('Doom 2D: Forever version ' + GAME_VERSION + ' proto ' + IntToStr(NET_PROTOCOL_VER), TMsgType.Notify);
+ e_WriteLog('Build date: ' + GAME_BUILDDATE + ' ' + GAME_BUILDTIME, TMsgType.Notify);
- GameWAD := e_FindWad(DataDirs, 'GAME');
- assert(GameWad <> '', 'GAME.WAD not installed?');
+ e_LogWritefln('BINARY PATH: [%s]', [binPath], TMsgType.Notify);
+ PrintDirs('DataDirs', DataDirs);
+ PrintDirs('ModelDirs', ModelDirs);
+ PrintDirs('MegawadDirs', MegawadDirs);
+ PrintDirs('MapDirs', MapDirs);
+ PrintDirs('WadDirs', WadDirs);
-// e_InitLog(GameDir + '/' + LogFileName, TWriteMode.WM_NEWFILE);
+ PrintDirs('LogDirs', LogDirs);
+ PrintDirs('SaveDirs', SaveDirs);
+ PrintDirs('CacheDirs', CacheDirs);
+ PrintDirs('ConfigDirs', ConfigDirs);
+ PrintDirs('ScreenshotDirs', ScreenshotDirs);
+ PrintDirs('MapDownloadDirs', MapDownloadDirs);
+ PrintDirs('WadDownloadDirs', WadDownloadDirs);
- e_WriteLog(
- 'Doom 2D: Forever version ' + GAME_VERSION +
- ' proto ' + IntToStr(NET_PROTOCOL_VER),
- TMsgType.Notify
- );
- e_WriteLog(
- 'Build date: ' + GAME_BUILDDATE + ' ' + GAME_BUILDTIME,
- TMsgType.Notify
- );
+ GameWAD := e_FindWad(DataDirs, 'GAME');
+ if GameWad = '' then
+ begin
+ e_WriteLog('GAME.WAD not installed?', TMsgType.Fatal);
+ {$IF DEFINED(USE_SDL2) AND NOT DEFINED(HEADLESS)}
+ SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, 'Doom 2D Forever', 'GAME.WAD not installed?', nil);
+ {$ENDIF}
+ Halt(1);
+ end;
-{$IFDEF HEADLESS}
- conbufDumpToStdOut := true;
-{$ENDIF}
- e_WriteToStdOut := False; //{$IFDEF HEADLESS}True;{$ELSE}False;{$ENDIF}
+ {$IF DEFINED(ANDROID) AND DEFINED(USE_SDLMIXER)}
+ timiditycfg := 'timidity.cfg';
+ if e_FindResource(ConfigDirs, timiditycfg) = true then
+ begin
+ timiditycfg := ExpandFileName(timiditycfg);
+ SetEnvVar('TIMIDITY_CFG', timiditycfg);
+ e_LogWritefln('Set TIMIDITY_CFG = "%s"', [timiditycfg]);
+ end;
+ {$ENDIF}
+end;
+procedure Main();
+{$IFDEF ENABLE_HOLMES}
+ var flexloaded: Boolean;
+{$ENDIF}
+ var s: AnsiString;
+begin
+ InitPath;
+ InitPrep;
e_InitInput;
-
sys_Init;
s := CONFIG_FILENAME;
if assigned(oglInitCB) then oglInitCB;
{$ENDIF}
- //g_Res_CreateDatabases(); // it will be done before connecting to the server for the first time
+ //g_Res_CreateDatabases(true); // it will be done before connecting to the server for the first time
e_WriteLog('Entering SDLMain', TMsgType.Notify);