hedgewars/uPhysFSLayer.pas
author nemo
Wed, 23 Oct 2019 17:45:28 -0400
changeset 15485 9f98eece9841
parent 14951 23fc5022bdea
permissions -rw-r--r--
forgot this commit.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10129
cd2a64a1f4aa - Pas2C: make use of 'external' function decorator
unc0rr
parents: 10127
diff changeset
     1
{$INCLUDE "options.inc"}
cd2a64a1f4aa - Pas2C: make use of 'external' function decorator
unc0rr
parents: 10127
diff changeset
     2
7959
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
     3
unit uPhysFSLayer;
8063
06efc1ea6a40 linking phsyfs on osx
koda
parents: 8062
diff changeset
     4
7959
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
     5
interface
8077
2ea5cde93abc Fix build
unc0rr
parents: 8073
diff changeset
     6
uses SDLh, LuaPas;
7959
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
     7
13927
3a0d09a31f5f fix library names in engine
alfadur
parents: 13511
diff changeset
     8
const PhysfsLibName =
3a0d09a31f5f fix library names in engine
alfadur
parents: 13511
diff changeset
     9
{$IFDEF PHYSFS_INTERNAL}
3a0d09a31f5f fix library names in engine
alfadur
parents: 13511
diff changeset
    10
    'libhwphysfs'
3a0d09a31f5f fix library names in engine
alfadur
parents: 13511
diff changeset
    11
{$ELSE}
3a0d09a31f5f fix library names in engine
alfadur
parents: 13511
diff changeset
    12
    {$IFDEF WIN32_VCPKG}'physfs'{$ELSE}'libphysfs'{$ENDIF};
3a0d09a31f5f fix library names in engine
alfadur
parents: 13511
diff changeset
    13
{$ENDIF}
3a0d09a31f5f fix library names in engine
alfadur
parents: 13511
diff changeset
    14
const PhyslayerLibName =
3a0d09a31f5f fix library names in engine
alfadur
parents: 13511
diff changeset
    15
    {$IFDEF WIN32_VCPKG}'physlayer'{$ELSE}'libphyslayer'{$ENDIF};
8073
5a289ef40fdb physfs compilation on windows
koda
parents: 8067
diff changeset
    16
14204
3c36a4e66c82 make engine windows checks work for 64bit builds
alfadur
parents: 13927
diff changeset
    17
{$IFNDEF WINDOWS}
8540
cf808329bb6f this should hijack the linker name and always pick the bundled physfs when another version is already prsent
koda
parents: 8533
diff changeset
    18
    {$linklib physfs}
cf808329bb6f this should hijack the linker name and always pick the bundled physfs when another version is already prsent
koda
parents: 8533
diff changeset
    19
    {$linklib physlayer}
8533
2d7703d6bc22 this should make physfs happy to link on windows too, forcing every function in its proper dll and skipping linklib
koda
parents: 8528
diff changeset
    20
{$ENDIF}
2d7703d6bc22 this should make physfs happy to link on windows too, forcing every function in its proper dll and skipping linklib
koda
parents: 8528
diff changeset
    21
11636
b3db79b56f28 Pass paths to initModule of uPhysFSLayer (as in 4be6cd55f1cf from qmlfrontend branch)
unc0rr
parents: 11155
diff changeset
    22
procedure initModule(localPrefix, userPrefix: PChar);
7959
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
    23
procedure freeModule;
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
    24
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    25
type PFSFile = pointer;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    26
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    27
function rwopsOpenRead(fname: shortstring): PSDL_RWops;
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    28
function rwopsOpenWrite(fname: shortstring): PSDL_RWops;
8022
10b3b93c1f56 - Add physfsrwops library
unc0rr
parents: 7963
diff changeset
    29
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    30
function pfsOpenRead(fname: shortstring): PFSFile;
11637
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    31
function pfsOpenWrite(fname: shortstring): PFSFile;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    32
function pfsFlush(f: PFSFile): boolean;
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    33
function pfsClose(f: PFSFile): boolean;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    34
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    35
procedure pfsReadLn(f: PFSFile; var s: shortstring);
10122
cefede760264 Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents: 10101
diff changeset
    36
procedure pfsReadLnA(f: PFSFile; var s: ansistring);
11637
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    37
procedure pfsWriteLn(f: PFSFile; s: shortstring);
14951
23fc5022bdea Implement AddFileLogRaw
Wuzzy <Wuzzy2@mail.ru>
parents: 14865
diff changeset
    38
procedure pfsWriteRaw(f: PFSFile; s: PChar; len: QWord);
8031
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
    39
function pfsBlockRead(f: PFSFile; buf: pointer; size: Int64): Int64;
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
    40
function pfsEOF(f: PFSFile): boolean;
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
    41
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
    42
function pfsExists(fname: shortstring): boolean;
11637
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    43
function pfsMakeDir(path: shortstring): boolean;
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    44
8533
2d7703d6bc22 this should make physfs happy to link on windows too, forcing every function in its proper dll and skipping linklib
koda
parents: 8528
diff changeset
    45
function  physfsReader(L: Plua_State; f: PFSFile; sz: Psize_t) : PChar; cdecl; external PhyslayerLibName;
2d7703d6bc22 this should make physfs happy to link on windows too, forcing every function in its proper dll and skipping linklib
koda
parents: 8528
diff changeset
    46
procedure physfsReaderSetBuffer(buf: pointer); cdecl; external PhyslayerLibName;
8978
e6ef8fe314bd suggestion of unc0rr's to fix issue w/ random maps in campaign. load sidecar packages in physfs for lua. should be useful also for lua that does custom layouts
nemo
parents: 8927
diff changeset
    47
procedure hedgewarsMountPackage(filename: PChar); cdecl; external PhyslayerLibName;
8077
2ea5cde93abc Fix build
unc0rr
parents: 8073
diff changeset
    48
7959
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
    49
implementation
14865
259840ca77e3 Fix Pas2C failing to include SysUtils
Wuzzy <Wuzzy2@mail.ru>
parents: 14204
diff changeset
    50
uses uConsts, uUtils, uVariables{$IFNDEF PAS2C}{$IFDEF HWLIBRARY}, SysUtils{$ENDIF}{$ELSE}, physfs{$ENDIF};
7959
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
    51
8839
caa57115d7ea Fixes to make pas2c parse this
unc0rr
parents: 8833
diff changeset
    52
function PHYSFSRWOPS_openRead(fname: PChar): PSDL_RWops; cdecl; external PhyslayerLibName;
8533
2d7703d6bc22 this should make physfs happy to link on windows too, forcing every function in its proper dll and skipping linklib
koda
parents: 8528
diff changeset
    53
function PHYSFSRWOPS_openWrite(fname: PChar): PSDL_RWops; cdecl; external PhyslayerLibName;
10129
cd2a64a1f4aa - Pas2C: make use of 'external' function decorator
unc0rr
parents: 10127
diff changeset
    54
procedure hedgewarsMountPackages(); cdecl; external PhyslayerLibName;
cd2a64a1f4aa - Pas2C: make use of 'external' function decorator
unc0rr
parents: 10127
diff changeset
    55
{$IFNDEF PAS2C}
cd2a64a1f4aa - Pas2C: make use of 'external' function decorator
unc0rr
parents: 10127
diff changeset
    56
function PHYSFS_init(argv0: PChar): LongInt; cdecl; external PhysfsLibName;
cd2a64a1f4aa - Pas2C: make use of 'external' function decorator
unc0rr
parents: 10127
diff changeset
    57
function PHYSFS_deinit(): LongInt; cdecl; external PhysfsLibName;
9993
76ad55807c24 allow engine to use symlinked fonts. disallow packages to "overwrite" fonts
sheepluva
parents: 9988
diff changeset
    58
function PHYSFS_mount(newDir, mountPoint: PChar; appendToPath: LongBool) : LongBool; cdecl; external PhysfsLibName;
8073
5a289ef40fdb physfs compilation on windows
koda
parents: 8067
diff changeset
    59
function PHYSFS_openRead(fname: PChar): PFSFile; cdecl; external PhysfsLibName;
11637
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    60
function PHYSFS_openWrite(fname: PChar): PFSFile; cdecl; external PhysfsLibName;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    61
function PHYSFS_setWriteDir(path: PChar): LongBool; cdecl; external PhysfsLibName;
8073
5a289ef40fdb physfs compilation on windows
koda
parents: 8067
diff changeset
    62
function PHYSFS_eof(f: PFSFile): LongBool; cdecl; external PhysfsLibName;
5a289ef40fdb physfs compilation on windows
koda
parents: 8067
diff changeset
    63
function PHYSFS_readBytes(f: PFSFile; buffer: pointer; len: Int64): Int64; cdecl; external PhysfsLibName;
11637
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    64
function PHYSFS_writeBytes(f: PFSFile; buffer: pointer; len: Int64): Int64; cdecl; external PhysfsLibName;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    65
function PHYSFS_seek(f: PFSFile; pos: QWord): LongBool; cdecl; external PhysfsLibName;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    66
function PHYSFS_flush(f: PFSFile): LongBool; cdecl; external PhysfsLibName;
8073
5a289ef40fdb physfs compilation on windows
koda
parents: 8067
diff changeset
    67
function PHYSFS_close(f: PFSFile): LongBool; cdecl; external PhysfsLibName;
12127
cc2d2f910d5a Add a buffer for files opened with physfs for reading, fixes slow engine start
unc0rr
parents: 11837
diff changeset
    68
function PHYSFS_setBuffer(f: PFSFile; pos: QWord): LongBool; cdecl; external PhysfsLibName;
8073
5a289ef40fdb physfs compilation on windows
koda
parents: 8067
diff changeset
    69
function PHYSFS_exists(fname: PChar): LongBool; cdecl; external PhysfsLibName;
11637
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    70
function PHYSFS_mkdir(path: PChar): LongBool; cdecl; external PhysfsLibName;
9993
76ad55807c24 allow engine to use symlinked fonts. disallow packages to "overwrite" fonts
sheepluva
parents: 9988
diff changeset
    71
function PHYSFS_getLastError(): PChar; cdecl; external PhysfsLibName;
11637
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    72
function PHYSFS_enumerateFiles(dir: PChar): PPChar; cdecl; external PhysfsLibName;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    73
procedure PHYSFS_freeList(list: PPChar); cdecl; external PhysfsLibName;
10129
cd2a64a1f4aa - Pas2C: make use of 'external' function decorator
unc0rr
parents: 10127
diff changeset
    74
{$ELSE}
cd2a64a1f4aa - Pas2C: make use of 'external' function decorator
unc0rr
parents: 10127
diff changeset
    75
function PHYSFS_readBytes(f: PFSFile; buffer: pointer; len: Int64): Int64;
cd2a64a1f4aa - Pas2C: make use of 'external' function decorator
unc0rr
parents: 10127
diff changeset
    76
begin
cd2a64a1f4aa - Pas2C: make use of 'external' function decorator
unc0rr
parents: 10127
diff changeset
    77
    PHYSFS_readBytes:= PHYSFS_read(f, buffer, 1, len);
cd2a64a1f4aa - Pas2C: make use of 'external' function decorator
unc0rr
parents: 10127
diff changeset
    78
end;
10078
8572d1f8b2f0 Some love to pas2c
unc0rr
parents: 10015
diff changeset
    79
{$ENDIF}
8052
845b5ae03841 Mount .hwt files found in Data folder
unc0rr
parents: 8046
diff changeset
    80
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    81
function rwopsOpenRead(fname: shortstring): PSDL_RWops;
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    82
begin
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    83
    exit(PHYSFSRWOPS_openRead(Str2PChar(fname)));
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    84
end;
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    85
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    86
function rwopsOpenWrite(fname: shortstring): PSDL_RWops;
7959
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
    87
begin
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    88
    exit(PHYSFSRWOPS_openWrite(Str2PChar(fname)));
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    89
end;
8022
10b3b93c1f56 - Add physfsrwops library
unc0rr
parents: 7963
diff changeset
    90
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    91
function pfsOpenRead(fname: shortstring): PFSFile;
12127
cc2d2f910d5a Add a buffer for files opened with physfs for reading, fixes slow engine start
unc0rr
parents: 11837
diff changeset
    92
var f: PFSFile;
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    93
begin
12127
cc2d2f910d5a Add a buffer for files opened with physfs for reading, fixes slow engine start
unc0rr
parents: 11837
diff changeset
    94
    f:= PHYSFS_openRead(Str2PChar(fname));
cc2d2f910d5a Add a buffer for files opened with physfs for reading, fixes slow engine start
unc0rr
parents: 11837
diff changeset
    95
    if f <> nil then
cc2d2f910d5a Add a buffer for files opened with physfs for reading, fixes slow engine start
unc0rr
parents: 11837
diff changeset
    96
        PHYSFS_setBuffer(f, 4096);
cc2d2f910d5a Add a buffer for files opened with physfs for reading, fixes slow engine start
unc0rr
parents: 11837
diff changeset
    97
    exit(f);
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    98
end;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    99
11637
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   100
function pfsOpenWrite(fname: shortstring): PFSFile;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   101
begin
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   102
    exit(PHYSFS_openWrite(Str2PChar(fname)));
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   103
end;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   104
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   105
function pfsEOF(f: PFSFile): boolean;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   106
begin
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   107
    exit(PHYSFS_eof(f))
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   108
end;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   109
11637
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   110
function pfsFlush(f: PFSFile): boolean;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   111
begin
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   112
    exit(PHYSFS_flush(f))
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   113
end;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   114
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   115
function pfsClose(f: PFSFile): boolean;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   116
begin
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   117
    exit(PHYSFS_close(f))
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   118
end;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   119
8031
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   120
function pfsExists(fname: shortstring): boolean;
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   121
begin
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   122
    exit(PHYSFS_exists(Str2PChar(fname)))
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   123
end;
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   124
11637
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   125
function pfsMakeDir(path: shortstring): boolean;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   126
begin
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   127
    exit(PHYSFS_mkdir(Str2PChar(path)))
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   128
end;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   129
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   130
function pfsEnumerateFiles(dir: shortstring): PPChar;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   131
begin
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   132
    exit(PHYSFS_enumerateFiles(Str2PChar(dir)))
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   133
end;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   134
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   135
procedure pfsFreeList(list: PPChar);
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   136
begin
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   137
    PHYSFS_freeList(list)
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   138
end;
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   139
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   140
procedure pfsReadLn(f: PFSFile; var s: shortstring);
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   141
var c: char;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   142
begin
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   143
s[0]:= #0;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   144
8034
fc032c0f7b23 Implement reader in C ffs
unc0rr
parents: 8031
diff changeset
   145
while (PHYSFS_readBytes(f, @c, 1) = 1) and (c <> #10) do
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   146
    if (c <> #13) and (s[0] < #255) then
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   147
        begin
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   148
        inc(s[0]);
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   149
        s[byte(s[0])]:= c
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   150
        end
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   151
end;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   152
10122
cefede760264 Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents: 10101
diff changeset
   153
procedure pfsReadLnA(f: PFSFile; var s: ansistring);
cefede760264 Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents: 10101
diff changeset
   154
var c: char;
cefede760264 Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents: 10101
diff changeset
   155
    b: shortstring;
8107
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   156
begin
10122
cefede760264 Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents: 10101
diff changeset
   157
s:= '';
cefede760264 Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents: 10101
diff changeset
   158
b[0]:= #0;
8107
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   159
10122
cefede760264 Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents: 10101
diff changeset
   160
while (PHYSFS_readBytes(f, @c, 1) = 1) and (c <> #10) do
cefede760264 Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents: 10101
diff changeset
   161
    if (c <> #13) then
8107
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   162
        begin
10122
cefede760264 Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents: 10101
diff changeset
   163
        inc(b[0]);
cefede760264 Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents: 10101
diff changeset
   164
        b[byte(b[0])]:= c;
cefede760264 Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents: 10101
diff changeset
   165
        if b[0] = #255 then
8107
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   166
            begin
10123
64e72781d344 Implicit type casts to help pas2c
unc0rr
parents: 10122
diff changeset
   167
            s:= s + ansistring(b);
10122
cefede760264 Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents: 10101
diff changeset
   168
            b[0]:= #0
8107
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   169
            end
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   170
        end;
10123
64e72781d344 Implicit type casts to help pas2c
unc0rr
parents: 10122
diff changeset
   171
64e72781d344 Implicit type casts to help pas2c
unc0rr
parents: 10122
diff changeset
   172
s:= s + ansistring(b)
8107
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   173
end;
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   174
11637
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   175
procedure pfsWriteLn(f: PFSFile; s: shortstring);
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   176
var c: char;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   177
begin
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   178
    c:= #10;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   179
    PHYSFS_writeBytes(f, @s[1], byte(s[0]));
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   180
    PHYSFS_writeBytes(f, @c, 1);
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   181
end;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   182
14951
23fc5022bdea Implement AddFileLogRaw
Wuzzy <Wuzzy2@mail.ru>
parents: 14865
diff changeset
   183
procedure pfsWriteRaw(f: PFSFile; s: PChar; len: QWord);
23fc5022bdea Implement AddFileLogRaw
Wuzzy <Wuzzy2@mail.ru>
parents: 14865
diff changeset
   184
begin
23fc5022bdea Implement AddFileLogRaw
Wuzzy <Wuzzy2@mail.ru>
parents: 14865
diff changeset
   185
    PHYSFS_writeBytes(f, s, len);
23fc5022bdea Implement AddFileLogRaw
Wuzzy <Wuzzy2@mail.ru>
parents: 14865
diff changeset
   186
end;
23fc5022bdea Implement AddFileLogRaw
Wuzzy <Wuzzy2@mail.ru>
parents: 14865
diff changeset
   187
8031
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   188
function pfsBlockRead(f: PFSFile; buf: pointer; size: Int64): Int64;
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   189
var r: Int64;
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   190
begin
8034
fc032c0f7b23 Implement reader in C ffs
unc0rr
parents: 8031
diff changeset
   191
    r:= PHYSFS_readBytes(f, buf, size);
8031
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   192
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   193
    if r <= 0 then
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   194
        pfsBlockRead:= 0
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   195
    else
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   196
        pfsBlockRead:= r
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   197
end;
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   198
11648
3bff941c035f Fix pas2c build
unc0rr
parents: 11637
diff changeset
   199
procedure pfsMount(path: PChar; mountpoint: PChar);
9993
76ad55807c24 allow engine to use symlinked fonts. disallow packages to "overwrite" fonts
sheepluva
parents: 9988
diff changeset
   200
begin
11649
f17df78181d8 - Init physfs before creating debug log
unc0rr
parents: 11648
diff changeset
   201
    PHYSFS_mount(path, mountpoint, false)
9993
76ad55807c24 allow engine to use symlinked fonts. disallow packages to "overwrite" fonts
sheepluva
parents: 9988
diff changeset
   202
end;
76ad55807c24 allow engine to use symlinked fonts. disallow packages to "overwrite" fonts
sheepluva
parents: 9988
diff changeset
   203
11648
3bff941c035f Fix pas2c build
unc0rr
parents: 11637
diff changeset
   204
procedure pfsMountAtRoot(path: PChar);
9993
76ad55807c24 allow engine to use symlinked fonts. disallow packages to "overwrite" fonts
sheepluva
parents: 9988
diff changeset
   205
begin
10129
cd2a64a1f4aa - Pas2C: make use of 'external' function decorator
unc0rr
parents: 10127
diff changeset
   206
    pfsMount(path, PChar(_S'/'));
9993
76ad55807c24 allow engine to use symlinked fonts. disallow packages to "overwrite" fonts
sheepluva
parents: 9988
diff changeset
   207
end;
76ad55807c24 allow engine to use symlinked fonts. disallow packages to "overwrite" fonts
sheepluva
parents: 9988
diff changeset
   208
11636
b3db79b56f28 Pass paths to initModule of uPhysFSLayer (as in 4be6cd55f1cf from qmlfrontend branch)
unc0rr
parents: 11155
diff changeset
   209
procedure initModule(localPrefix, userPrefix: PChar);
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
   210
var i: LongInt;
8310
a98c349bc06b minor adjustments to libengine, moc is correctly created as definitions are set before calling it, params are better numbered and we don't subclass qthread but rather use moveToThread()
koda
parents: 8283
diff changeset
   211
    cPhysfsId: shortstring;
11139
4f4e97eb52fd - Load fonts on init if not 'mobile'
antonc27 <antonc27@mail.ru>
parents: 11087
diff changeset
   212
{$IFNDEF MOBILE}
9996
d93fb04619ee unCORr likes PChar arrays
sheepluva
parents: 9994
diff changeset
   213
    fp: PChar;
11155
a10143c3d87d pas2c doesn't like {$ENDIF} with argument
sheepluva
parents: 11139
diff changeset
   214
{$ENDIF}
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
   215
begin
8310
a98c349bc06b minor adjustments to libengine, moc is correctly created as definitions are set before calling it, params are better numbered and we don't subclass qthread but rather use moveToThread()
koda
parents: 8283
diff changeset
   216
{$IFDEF HWLIBRARY}
13511
36f3f77e9b1b Switch from http:// to https:// URLs where possible
Wuzzy <Wuzzy2@mail.ru>
parents: 12127
diff changeset
   217
    //TODO: https://icculus.org/pipermail/physfs/2011-August/001006.html
11688
17d102f9515d Add workaround to force string concatenation in pas2c
koda
parents: 11649
diff changeset
   218
    cPhysfsId:= shortstring(GetCurrentDir()) + {$IFDEF DARWIN}{$IFNDEF IPHONEOS}'/Hedgewars.app/Contents/MacOS/' + {$ENDIF}{$ENDIF} ' hedgewars';
8310
a98c349bc06b minor adjustments to libengine, moc is correctly created as definitions are set before calling it, params are better numbered and we don't subclass qthread but rather use moveToThread()
koda
parents: 8283
diff changeset
   219
{$ELSE}
a98c349bc06b minor adjustments to libengine, moc is correctly created as definitions are set before calling it, params are better numbered and we don't subclass qthread but rather use moveToThread()
koda
parents: 8283
diff changeset
   220
    cPhysfsId:= ParamStr(0);
a98c349bc06b minor adjustments to libengine, moc is correctly created as definitions are set before calling it, params are better numbered and we don't subclass qthread but rather use moveToThread()
koda
parents: 8283
diff changeset
   221
{$ENDIF}
a98c349bc06b minor adjustments to libengine, moc is correctly created as definitions are set before calling it, params are better numbered and we don't subclass qthread but rather use moveToThread()
koda
parents: 8283
diff changeset
   222
a98c349bc06b minor adjustments to libengine, moc is correctly created as definitions are set before calling it, params are better numbered and we don't subclass qthread but rather use moveToThread()
koda
parents: 8283
diff changeset
   223
    i:= PHYSFS_init(Str2PChar(cPhysfsId));
11649
f17df78181d8 - Init physfs before creating debug log
unc0rr
parents: 11648
diff changeset
   224
    //AddFileLog('[PhysFS] init: ' + inttostr(i));
11139
4f4e97eb52fd - Load fonts on init if not 'mobile'
antonc27 <antonc27@mail.ru>
parents: 11087
diff changeset
   225
4f4e97eb52fd - Load fonts on init if not 'mobile'
antonc27 <antonc27@mail.ru>
parents: 11087
diff changeset
   226
{$IFNDEF MOBILE}
9994
8455993a7a1b * allow telling cmake where to find required fonts in system when user supplies the paths, as suggested by unC0Rr, e.g. -DFONTS_DIRS='/usr/share/fonts/truetype/wqy;/usr/share/fonts/truetype/dejavu'
sheepluva
parents: 9993
diff changeset
   227
    // mount system fonts paths first
9996
d93fb04619ee unCORr likes PChar arrays
sheepluva
parents: 9994
diff changeset
   228
    for i:= low(cFontsPaths) to high(cFontsPaths) do
9994
8455993a7a1b * allow telling cmake where to find required fonts in system when user supplies the paths, as suggested by unC0Rr, e.g. -DFONTS_DIRS='/usr/share/fonts/truetype/wqy;/usr/share/fonts/truetype/dejavu'
sheepluva
parents: 9993
diff changeset
   229
        begin
9996
d93fb04619ee unCORr likes PChar arrays
sheepluva
parents: 9994
diff changeset
   230
            fp := cFontsPaths[i];
d93fb04619ee unCORr likes PChar arrays
sheepluva
parents: 9994
diff changeset
   231
            if fp <> nil then
11648
3bff941c035f Fix pas2c build
unc0rr
parents: 11637
diff changeset
   232
                pfsMount(fp, _P'/Fonts');
9994
8455993a7a1b * allow telling cmake where to find required fonts in system when user supplies the paths, as suggested by unC0Rr, e.g. -DFONTS_DIRS='/usr/share/fonts/truetype/wqy;/usr/share/fonts/truetype/dejavu'
sheepluva
parents: 9993
diff changeset
   233
        end;
11155
a10143c3d87d pas2c doesn't like {$ENDIF} with argument
sheepluva
parents: 11139
diff changeset
   234
{$ENDIF}
11139
4f4e97eb52fd - Load fonts on init if not 'mobile'
antonc27 <antonc27@mail.ru>
parents: 11087
diff changeset
   235
11636
b3db79b56f28 Pass paths to initModule of uPhysFSLayer (as in 4be6cd55f1cf from qmlfrontend branch)
unc0rr
parents: 11155
diff changeset
   236
    pfsMountAtRoot(localPrefix);
11637
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   237
    pfsMount(userPrefix, PChar('/Config'));
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   238
    pfsMakeDir('/Config/Data');
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   239
    pfsMakeDir('/Config/Logs');
11648
3bff941c035f Fix pas2c build
unc0rr
parents: 11637
diff changeset
   240
    pfsMountAtRoot(Str2PChar(shortstring(userPrefix) + '/Data'));
11637
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   241
    PHYSFS_setWriteDir(userPrefix);
8052
845b5ae03841 Mount .hwt files found in Data folder
unc0rr
parents: 8046
diff changeset
   242
845b5ae03841 Mount .hwt files found in Data folder
unc0rr
parents: 8046
diff changeset
   243
    hedgewarsMountPackages;
9531
7fcdedc45589 Unbreak access to Data dir in profile broken in r8b48c27201af
unc0rr
parents: 9466
diff changeset
   244
7fcdedc45589 Unbreak access to Data dir in profile broken in r8b48c27201af
unc0rr
parents: 9466
diff changeset
   245
    // need access to teams and frontend configs (for bindings)
11636
b3db79b56f28 Pass paths to initModule of uPhysFSLayer (as in 4be6cd55f1cf from qmlfrontend branch)
unc0rr
parents: 11155
diff changeset
   246
    pfsMountAtRoot(userPrefix);
9988
317d46a2afd2 simple mechanism to run lua-based test cases. experimental - I will back it out if it turns out to be nonsense
sheepluva
parents: 9531
diff changeset
   247
317d46a2afd2 simple mechanism to run lua-based test cases. experimental - I will back it out if it turns out to be nonsense
sheepluva
parents: 9531
diff changeset
   248
    if cTestLua then
317d46a2afd2 simple mechanism to run lua-based test cases. experimental - I will back it out if it turns out to be nonsense
sheepluva
parents: 9531
diff changeset
   249
        begin
11648
3bff941c035f Fix pas2c build
unc0rr
parents: 11637
diff changeset
   250
            pfsMountAtRoot(Str2PChar(ExtractFileDir(cScriptName)));
9988
317d46a2afd2 simple mechanism to run lua-based test cases. experimental - I will back it out if it turns out to be nonsense
sheepluva
parents: 9531
diff changeset
   251
            cScriptName := ExtractFileName(cScriptName);
317d46a2afd2 simple mechanism to run lua-based test cases. experimental - I will back it out if it turns out to be nonsense
sheepluva
parents: 9531
diff changeset
   252
        end;
7959
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
   253
end;
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
   254
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
   255
procedure freeModule;
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
   256
begin
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
   257
    PHYSFS_deinit;
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
   258
end;
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
   259
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
   260
end.