hedgewars/uPhysFSLayer.pas
author unc0rr
Fri, 05 Jan 2018 22:32:11 +0100
branchqmlfrontend
changeset 12885 590c7f324292
parent 12860 1b2b84315d27
permissions -rw-r--r--
Fix missing default values
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
9204
1c233176fffd drop the '_'
koda
parents: 9202
diff changeset
     8
const PhysfsLibName = {$IFDEF PHYSFS_INTERNAL}'libhwphysfs'{$ELSE}'libphysfs'{$ENDIF};
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
     9
const PhyslayerLibName = 'libphyslayer';
8073
5a289ef40fdb physfs compilation on windows
koda
parents: 8067
diff changeset
    10
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
    11
{$IFNDEF WIN32}
cf808329bb6f this should hijack the linker name and always pick the bundled physfs when another version is already prsent
koda
parents: 8533
diff changeset
    12
    {$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
    13
    {$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
    14
{$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
    15
11636
b3db79b56f28 Pass paths to initModule of uPhysFSLayer (as in 4be6cd55f1cf from qmlfrontend branch)
unc0rr
parents: 11155
diff changeset
    16
procedure initModule(localPrefix, userPrefix: PChar);
7959
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
    17
procedure freeModule;
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
    18
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    19
type PFSFile = pointer;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    20
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    21
function rwopsOpenRead(fname: shortstring): PSDL_RWops;
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    22
function rwopsOpenWrite(fname: shortstring): PSDL_RWops;
8022
10b3b93c1f56 - Add physfsrwops library
unc0rr
parents: 7963
diff changeset
    23
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    24
function pfsOpenRead(fname: shortstring): PFSFile;
11637
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    25
function pfsOpenWrite(fname: shortstring): PFSFile;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    26
function pfsFlush(f: PFSFile): boolean;
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    27
function pfsClose(f: PFSFile): boolean;
10888
a04e04aaf599 Ammo schemes list, almost works
unc0rr
parents: 10606
diff changeset
    28
function pfsSeek(f: PFSFile; pos: QWord): boolean;
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    29
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    30
procedure pfsReadLn(f: PFSFile; var s: shortstring);
10122
cefede760264 Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents: 10101
diff changeset
    31
procedure pfsReadLnA(f: PFSFile; var s: ansistring);
11637
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    32
procedure pfsWriteLn(f: PFSFile; s: shortstring);
8031
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
    33
function pfsBlockRead(f: PFSFile; buf: pointer; size: Int64): Int64;
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
    34
function pfsEOF(f: PFSFile): boolean;
10434
1614b13ad35e Themes model, also add some files I forgot to add previously
unc0rr
parents: 10424
diff changeset
    35
function pfsEnumerateFiles(dir: shortstring): PPChar;
1614b13ad35e Themes model, also add some files I forgot to add previously
unc0rr
parents: 10424
diff changeset
    36
procedure pfsFreeList(list: PPChar);
8031
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
    37
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
    38
function pfsExists(fname: shortstring): boolean;
11637
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    39
function pfsMakeDir(path: shortstring): boolean;
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    40
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
    41
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
    42
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
    43
procedure hedgewarsMountPackage(filename: PChar); cdecl; external PhyslayerLibName;
8077
2ea5cde93abc Fix build
unc0rr
parents: 8073
diff changeset
    44
7959
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
    45
implementation
11837
f2ab65d97242 - In case of HWLIBRARY we need reference to sysutils for GetCurrentDir()
antonc27 <antonc27@mail.ru>
parents: 11831
diff changeset
    46
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
    47
8839
caa57115d7ea Fixes to make pas2c parse this
unc0rr
parents: 8833
diff changeset
    48
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
    49
function PHYSFSRWOPS_openWrite(fname: PChar): PSDL_RWops; cdecl; external PhyslayerLibName;
10129
cd2a64a1f4aa - Pas2C: make use of 'external' function decorator
unc0rr
parents: 10127
diff changeset
    50
procedure hedgewarsMountPackages(); cdecl; external PhyslayerLibName;
cd2a64a1f4aa - Pas2C: make use of 'external' function decorator
unc0rr
parents: 10127
diff changeset
    51
{$IFNDEF PAS2C}
cd2a64a1f4aa - Pas2C: make use of 'external' function decorator
unc0rr
parents: 10127
diff changeset
    52
function PHYSFS_init(argv0: PChar): LongInt; cdecl; external PhysfsLibName;
cd2a64a1f4aa - Pas2C: make use of 'external' function decorator
unc0rr
parents: 10127
diff changeset
    53
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
    54
function PHYSFS_mount(newDir, mountPoint: PChar; appendToPath: LongBool) : LongBool; cdecl; external PhysfsLibName;
8073
5a289ef40fdb physfs compilation on windows
koda
parents: 8067
diff changeset
    55
function PHYSFS_openRead(fname: PChar): PFSFile; cdecl; external PhysfsLibName;
11637
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    56
function PHYSFS_openWrite(fname: PChar): PFSFile; cdecl; external PhysfsLibName;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    57
function PHYSFS_setWriteDir(path: PChar): LongBool; cdecl; external PhysfsLibName;
8073
5a289ef40fdb physfs compilation on windows
koda
parents: 8067
diff changeset
    58
function PHYSFS_eof(f: PFSFile): LongBool; cdecl; external PhysfsLibName;
5a289ef40fdb physfs compilation on windows
koda
parents: 8067
diff changeset
    59
function PHYSFS_readBytes(f: PFSFile; buffer: pointer; len: Int64): Int64; cdecl; external PhysfsLibName;
11637
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    60
function PHYSFS_writeBytes(f: PFSFile; buffer: pointer; len: Int64): Int64; cdecl; external PhysfsLibName;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    61
function PHYSFS_seek(f: PFSFile; pos: QWord): LongBool; cdecl; external PhysfsLibName;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    62
function PHYSFS_flush(f: PFSFile): LongBool; cdecl; external PhysfsLibName;
8073
5a289ef40fdb physfs compilation on windows
koda
parents: 8067
diff changeset
    63
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
    64
function PHYSFS_setBuffer(f: PFSFile; pos: QWord): LongBool; cdecl; external PhysfsLibName;
8073
5a289ef40fdb physfs compilation on windows
koda
parents: 8067
diff changeset
    65
function PHYSFS_exists(fname: PChar): LongBool; cdecl; external PhysfsLibName;
11637
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    66
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
    67
function PHYSFS_getLastError(): PChar; cdecl; external PhysfsLibName;
11637
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    68
function PHYSFS_enumerateFiles(dir: PChar): PPChar; cdecl; external PhysfsLibName;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    69
procedure PHYSFS_freeList(list: PPChar); cdecl; external PhysfsLibName;
10129
cd2a64a1f4aa - Pas2C: make use of 'external' function decorator
unc0rr
parents: 10127
diff changeset
    70
{$ELSE}
cd2a64a1f4aa - Pas2C: make use of 'external' function decorator
unc0rr
parents: 10127
diff changeset
    71
function PHYSFS_readBytes(f: PFSFile; buffer: pointer; len: Int64): Int64;
cd2a64a1f4aa - Pas2C: make use of 'external' function decorator
unc0rr
parents: 10127
diff changeset
    72
begin
cd2a64a1f4aa - Pas2C: make use of 'external' function decorator
unc0rr
parents: 10127
diff changeset
    73
    PHYSFS_readBytes:= PHYSFS_read(f, buffer, 1, len);
cd2a64a1f4aa - Pas2C: make use of 'external' function decorator
unc0rr
parents: 10127
diff changeset
    74
end;
10078
8572d1f8b2f0 Some love to pas2c
unc0rr
parents: 10015
diff changeset
    75
{$ENDIF}
8052
845b5ae03841 Mount .hwt files found in Data folder
unc0rr
parents: 8046
diff changeset
    76
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    77
function rwopsOpenRead(fname: shortstring): PSDL_RWops;
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    78
begin
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    79
    exit(PHYSFSRWOPS_openRead(Str2PChar(fname)));
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    80
end;
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    81
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    82
function rwopsOpenWrite(fname: shortstring): PSDL_RWops;
7959
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
    83
begin
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    84
    exit(PHYSFSRWOPS_openWrite(Str2PChar(fname)));
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
    85
end;
8022
10b3b93c1f56 - Add physfsrwops library
unc0rr
parents: 7963
diff changeset
    86
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    87
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
    88
var f: PFSFile;
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    89
begin
12127
cc2d2f910d5a Add a buffer for files opened with physfs for reading, fixes slow engine start
unc0rr
parents: 11837
diff changeset
    90
    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
    91
    if f <> nil then
cc2d2f910d5a Add a buffer for files opened with physfs for reading, fixes slow engine start
unc0rr
parents: 11837
diff changeset
    92
        PHYSFS_setBuffer(f, 4096);
cc2d2f910d5a Add a buffer for files opened with physfs for reading, fixes slow engine start
unc0rr
parents: 11837
diff changeset
    93
    exit(f);
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    94
end;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
    95
11637
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    96
function pfsOpenWrite(fname: shortstring): PFSFile;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    97
begin
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    98
    exit(PHYSFS_openWrite(Str2PChar(fname)));
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
    99
end;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   100
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   101
function pfsEOF(f: PFSFile): boolean;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   102
begin
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   103
    exit(PHYSFS_eof(f))
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   104
end;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   105
11637
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   106
function pfsFlush(f: PFSFile): boolean;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   107
begin
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   108
    exit(PHYSFS_flush(f))
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   109
end;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   110
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   111
function pfsClose(f: PFSFile): boolean;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   112
begin
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   113
    exit(PHYSFS_close(f))
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   114
end;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   115
10888
a04e04aaf599 Ammo schemes list, almost works
unc0rr
parents: 10606
diff changeset
   116
function pfsSeek(f: PFSFile; pos: QWord): boolean;
a04e04aaf599 Ammo schemes list, almost works
unc0rr
parents: 10606
diff changeset
   117
begin
a04e04aaf599 Ammo schemes list, almost works
unc0rr
parents: 10606
diff changeset
   118
    exit(PHYSFS_seek(f, 0));
a04e04aaf599 Ammo schemes list, almost works
unc0rr
parents: 10606
diff changeset
   119
end;
a04e04aaf599 Ammo schemes list, almost works
unc0rr
parents: 10606
diff changeset
   120
8031
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   121
function pfsExists(fname: shortstring): boolean;
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   122
begin
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   123
    exit(PHYSFS_exists(Str2PChar(fname)))
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   124
end;
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   125
11637
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   126
function pfsMakeDir(path: shortstring): boolean;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   127
begin
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   128
    exit(PHYSFS_mkdir(Str2PChar(path)))
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   129
end;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   130
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   131
function pfsEnumerateFiles(dir: shortstring): PPChar;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   132
begin
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   133
    exit(PHYSFS_enumerateFiles(Str2PChar(dir)))
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   134
end;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   135
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   136
procedure pfsFreeList(list: PPChar);
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   137
begin
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   138
    PHYSFS_freeList(list)
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   139
end;
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   140
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   141
procedure pfsReadLn(f: PFSFile; var s: shortstring);
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   142
var c: char;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   143
begin
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   144
s[0]:= #0;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   145
8034
fc032c0f7b23 Implement reader in C ffs
unc0rr
parents: 8031
diff changeset
   146
while (PHYSFS_readBytes(f, @c, 1) = 1) and (c <> #10) do
8028
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   147
    if (c <> #13) and (s[0] < #255) then
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   148
        begin
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   149
        inc(s[0]);
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   150
        s[byte(s[0])]:= c
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
end;
dc30104660d3 Engine loads fine with basic config
unc0rr
parents: 8025
diff changeset
   153
10122
cefede760264 Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents: 10101
diff changeset
   154
procedure pfsReadLnA(f: PFSFile; var s: ansistring);
cefede760264 Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents: 10101
diff changeset
   155
var c: char;
cefede760264 Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents: 10101
diff changeset
   156
    b: shortstring;
8107
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   157
begin
10122
cefede760264 Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents: 10101
diff changeset
   158
s:= '';
cefede760264 Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents: 10101
diff changeset
   159
b[0]:= #0;
8107
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   160
10122
cefede760264 Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents: 10101
diff changeset
   161
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
   162
    if (c <> #13) then
8107
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   163
        begin
10122
cefede760264 Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents: 10101
diff changeset
   164
        inc(b[0]);
cefede760264 Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents: 10101
diff changeset
   165
        b[byte(b[0])]:= c;
cefede760264 Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents: 10101
diff changeset
   166
        if b[0] = #255 then
8107
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   167
            begin
10123
64e72781d344 Implicit type casts to help pas2c
unc0rr
parents: 10122
diff changeset
   168
            s:= s + ansistring(b);
10122
cefede760264 Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents: 10101
diff changeset
   169
            b[0]:= #0
8107
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   170
            end
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   171
        end;
10123
64e72781d344 Implicit type casts to help pas2c
unc0rr
parents: 10122
diff changeset
   172
64e72781d344 Implicit type casts to help pas2c
unc0rr
parents: 10122
diff changeset
   173
s:= s + ansistring(b)
8107
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   174
end;
ee21b816394f Bring ansistrings back
unc0rr
parents: 8080
diff changeset
   175
11637
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   176
procedure pfsWriteLn(f: PFSFile; s: shortstring);
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   177
var c: char;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   178
begin
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   179
    c:= #10;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   180
    PHYSFS_writeBytes(f, @s[1], byte(s[0]));
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   181
    PHYSFS_writeBytes(f, @c, 1);
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   182
end;
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   183
8031
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   184
function pfsBlockRead(f: PFSFile; buf: pointer; size: Int64): Int64;
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   185
var r: Int64;
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   186
begin
8034
fc032c0f7b23 Implement reader in C ffs
unc0rr
parents: 8031
diff changeset
   187
    r:= PHYSFS_readBytes(f, buf, size);
8031
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   188
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   189
    if r <= 0 then
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   190
        pfsBlockRead:= 0
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   191
    else
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   192
        pfsBlockRead:= r
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   193
end;
fc40b343c45c Script loading via physfs which doesn't work:
unc0rr
parents: 8028
diff changeset
   194
11648
3bff941c035f Fix pas2c build
unc0rr
parents: 11637
diff changeset
   195
procedure pfsMount(path: PChar; mountpoint: PChar);
9993
76ad55807c24 allow engine to use symlinked fonts. disallow packages to "overwrite" fonts
sheepluva
parents: 9988
diff changeset
   196
begin
12860
1b2b84315d27 Merge default. This branch is up-to-date and code is working.
unc0rr
parents: 11846 12127
diff changeset
   197
    system.writeln('Mounting ',path,' at ', mountpoint);
11649
f17df78181d8 - Init physfs before creating debug log
unc0rr
parents: 11648
diff changeset
   198
    PHYSFS_mount(path, mountpoint, false)
9993
76ad55807c24 allow engine to use symlinked fonts. disallow packages to "overwrite" fonts
sheepluva
parents: 9988
diff changeset
   199
end;
76ad55807c24 allow engine to use symlinked fonts. disallow packages to "overwrite" fonts
sheepluva
parents: 9988
diff changeset
   200
11648
3bff941c035f Fix pas2c build
unc0rr
parents: 11637
diff changeset
   201
procedure pfsMountAtRoot(path: PChar);
9993
76ad55807c24 allow engine to use symlinked fonts. disallow packages to "overwrite" fonts
sheepluva
parents: 9988
diff changeset
   202
begin
12860
1b2b84315d27 Merge default. This branch is up-to-date and code is working.
unc0rr
parents: 11846 12127
diff changeset
   203
    system.writeln('Mounting ',path,' at root');
10129
cd2a64a1f4aa - Pas2C: make use of 'external' function decorator
unc0rr
parents: 10127
diff changeset
   204
    pfsMount(path, PChar(_S'/'));
9993
76ad55807c24 allow engine to use symlinked fonts. disallow packages to "overwrite" fonts
sheepluva
parents: 9988
diff changeset
   205
end;
76ad55807c24 allow engine to use symlinked fonts. disallow packages to "overwrite" fonts
sheepluva
parents: 9988
diff changeset
   206
11636
b3db79b56f28 Pass paths to initModule of uPhysFSLayer (as in 4be6cd55f1cf from qmlfrontend branch)
unc0rr
parents: 11155
diff changeset
   207
procedure initModule(localPrefix, userPrefix: PChar);
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
   208
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
   209
    cPhysfsId: shortstring;
11139
4f4e97eb52fd - Load fonts on init if not 'mobile'
antonc27 <antonc27@mail.ru>
parents: 11087
diff changeset
   210
{$IFNDEF MOBILE}
9996
d93fb04619ee unCORr likes PChar arrays
sheepluva
parents: 9994
diff changeset
   211
    fp: PChar;
11155
a10143c3d87d pas2c doesn't like {$ENDIF} with argument
sheepluva
parents: 11139
diff changeset
   212
{$ENDIF}
8025
07862ab415c8 Get rid of Pathz and UserPathz
unc0rr
parents: 8022
diff changeset
   213
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
   214
    //TODO: http://icculus.org/pipermail/physfs/2011-August/001006.html
11833
a69124eb7ce7 Merge default
unc0rr
parents: 11704 11831
diff changeset
   215
    cPhysfsId:= {$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
   216
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
   217
    i:= PHYSFS_init(Str2PChar(cPhysfsId));
11649
f17df78181d8 - Init physfs before creating debug log
unc0rr
parents: 11648
diff changeset
   218
    //AddFileLog('[PhysFS] init: ' + inttostr(i));
11139
4f4e97eb52fd - Load fonts on init if not 'mobile'
antonc27 <antonc27@mail.ru>
parents: 11087
diff changeset
   219
4f4e97eb52fd - Load fonts on init if not 'mobile'
antonc27 <antonc27@mail.ru>
parents: 11087
diff changeset
   220
{$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
   221
    // mount system fonts paths first
9996
d93fb04619ee unCORr likes PChar arrays
sheepluva
parents: 9994
diff changeset
   222
    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
   223
        begin
9996
d93fb04619ee unCORr likes PChar arrays
sheepluva
parents: 9994
diff changeset
   224
            fp := cFontsPaths[i];
d93fb04619ee unCORr likes PChar arrays
sheepluva
parents: 9994
diff changeset
   225
            if fp <> nil then
11648
3bff941c035f Fix pas2c build
unc0rr
parents: 11637
diff changeset
   226
                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
   227
        end;
11155
a10143c3d87d pas2c doesn't like {$ENDIF} with argument
sheepluva
parents: 11139
diff changeset
   228
{$ENDIF}
11139
4f4e97eb52fd - Load fonts on init if not 'mobile'
antonc27 <antonc27@mail.ru>
parents: 11087
diff changeset
   229
11636
b3db79b56f28 Pass paths to initModule of uPhysFSLayer (as in 4be6cd55f1cf from qmlfrontend branch)
unc0rr
parents: 11155
diff changeset
   230
    pfsMountAtRoot(localPrefix);
11637
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   231
    pfsMount(userPrefix, PChar('/Config'));
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   232
    pfsMakeDir('/Config/Data');
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   233
    pfsMakeDir('/Config/Logs');
11648
3bff941c035f Fix pas2c build
unc0rr
parents: 11637
diff changeset
   234
    pfsMountAtRoot(Str2PChar(shortstring(userPrefix) + '/Data'));
11637
cac74d9075be logging via physfs
unc0rr
parents: 11636
diff changeset
   235
    PHYSFS_setWriteDir(userPrefix);
8052
845b5ae03841 Mount .hwt files found in Data folder
unc0rr
parents: 8046
diff changeset
   236
845b5ae03841 Mount .hwt files found in Data folder
unc0rr
parents: 8046
diff changeset
   237
    hedgewarsMountPackages;
9531
7fcdedc45589 Unbreak access to Data dir in profile broken in r8b48c27201af
unc0rr
parents: 9466
diff changeset
   238
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
   239
    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
   240
        begin
11648
3bff941c035f Fix pas2c build
unc0rr
parents: 11637
diff changeset
   241
            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
   242
            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
   243
        end;
7959
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
   244
end;
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
   245
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
   246
procedure freeModule;
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
   247
begin
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
   248
    PHYSFS_deinit;
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
   249
end;
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
   250
644b757d20e6 Start work on physfs support in engine
unc0rr
parents:
diff changeset
   251
end.