From: Ketmar Dark <ketmar@ketmar.no-ip.org>
Date: Mon, 21 Oct 2019 03:24:43 +0000 (+0300)
Subject: game: do not force CLI pathes to cwd
X-Git-Url: https://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=commitdiff_plain;h=97d60066e65ea8b2377a2a7137c3a0c3cb5d63a4

game: do not force CLI pathes to cwd
---

diff --git a/src/game/g_main.pas b/src/game/g_main.pas
index 9a4e345..0e349af 100644
--- a/src/game/g_main.pas
+++ b/src/game/g_main.pas
@@ -125,22 +125,23 @@ procedure InitPath;
   begin
   end;
 
-  procedure AddPath (var arr: SSArray; str: AnsiString);
+  procedure AddPath (var arr: SSArray; str: AnsiString; usecwd: Boolean=true);
   var
     ss: ShortString;
   begin
     if (length(str) = 0) then exit;
-    if (forceCurrentDir) then
+    //writeln('NEW PATH(0): ['+str+']');
+    if (forceCurrentDir or usecwd) then
     begin
       str := fixSlashes(ExpandFileName(str));
     end
     else
     begin
       str := fixSlashes(str);
-      if (str[1] <> '/') then str := binPath+str;
+      if (not isAbsolutePath(str)) then str := binPath+str;
       while (length(str) > 0) do
       begin
-        if (str = '/') then exit;
+        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;
@@ -160,12 +161,12 @@ procedure InitPath;
     SetLength(arr, Length(arr)+1);
     //arr[High(arr)] := ExpandFileName(str);
     arr[High(arr)] := str;
-    xput('NEW PATH: ['+str+']');
+    //writeln('NEW PATH(1): ['+str+']');
   end;
 
   procedure AddDef (var arr: SSArray; str: AnsiString);
   begin
-    if (length(arr) = 0) then AddPath(arr, str)
+    if (length(arr) = 0) then AddPath(arr, str, false)
   end;
 
 begin