From b4b66ea803f8d896c2b2abd75108ef233030da03 Mon Sep 17 00:00:00 2001 From: Ketmar Dark Date: Sat, 2 Nov 2019 08:06:27 +0200 Subject: [PATCH] utils: game: backslash is windoze-specific path separator --- src/game/g_main.pas | 6 +++++- src/shared/utils.pas | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/game/g_main.pas b/src/game/g_main.pas index 050ee1f..9fadc1b 100644 --- a/src/game/g_main.pas +++ b/src/game/g_main.pas @@ -139,7 +139,11 @@ procedure InitPath; function IsSep (ch: Char): Boolean; begin - result := (ch = '/') or (ch = '\') + {$IFDEF WINDOWS} + result := (ch = '/') or (ch = '\'); + {$ELSE} + result := (ch = '/'); + {$ENDIF} end; function OptimizePath (dir: AnsiString): AnsiString; diff --git a/src/shared/utils.pas b/src/shared/utils.pas index 14fa53b..790feb7 100644 --- a/src/shared/utils.pas +++ b/src/shared/utils.pas @@ -342,11 +342,15 @@ end; // ////////////////////////////////////////////////////////////////////////// // // rewrites slashes to '/' function fixSlashes (s: AnsiString): AnsiString; +{$IFDEF WINDOWS} var f: Integer; +{$ENDIF} begin result := s; + {$IFDEF WINDOWS} for f := 1 to length(result) do if (result[f] = '\') then result[f] := '/'; + {$ENDIF} end; -- 2.29.2