| author | unc0rr |
| Sat, 04 Jan 2014 23:55:54 +0400 | |
| branch | webgl |
| changeset 9950 | 2759212a27de |
| parent 9521 | 8054d9d775fd |
| parent 9531 | 7fcdedc45589 |
| child 10015 | 4feced261c68 |
| permissions | -rw-r--r-- |
| 7959 | 1 |
unit uPhysFSLayer; |
| 8063 | 2 |
|
| 7959 | 3 |
interface |
| 8077 | 4 |
uses SDLh, LuaPas; |
| 7959 | 5 |
|
| 9204 | 6 |
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
|
7 |
const PhyslayerLibName = 'libphyslayer'; |
| 8073 | 8 |
|
|
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 |
{$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
|
10 |
{$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
|
11 |
{$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
|
12 |
{$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
|
13 |
|
| 7959 | 14 |
procedure initModule; |
15 |
procedure freeModule; |
|
16 |
||
| 8028 | 17 |
type PFSFile = pointer; |
18 |
||
| 8025 | 19 |
function rwopsOpenRead(fname: shortstring): PSDL_RWops; |
20 |
function rwopsOpenWrite(fname: shortstring): PSDL_RWops; |
|
| 8022 | 21 |
|
| 8028 | 22 |
function pfsOpenRead(fname: shortstring): PFSFile; |
23 |
function pfsClose(f: PFSFile): boolean; |
|
24 |
||
25 |
procedure pfsReadLn(f: PFSFile; var s: shortstring); |
|
| 8107 | 26 |
procedure pfsReadLnA(f: PFSFile; var s: ansistring); |
| 8031 | 27 |
function pfsBlockRead(f: PFSFile; buf: pointer; size: Int64): Int64; |
28 |
function pfsEOF(f: PFSFile): boolean; |
|
29 |
||
30 |
function pfsExists(fname: shortstring): boolean; |
|
| 8028 | 31 |
|
| 9264 | 32 |
{$IFNDEF PAS2C}
|
|
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
|
33 |
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
|
34 |
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
|
35 |
procedure hedgewarsMountPackage(filename: PChar); cdecl; external PhyslayerLibName; |
| 9264 | 36 |
{$ENDIF}
|
| 8077 | 37 |
|
| 7959 | 38 |
implementation |
| 9260 | 39 |
uses uUtils, uVariables; |
| 7959 | 40 |
|
| 8105 | 41 |
{$IFNDEF PAS2C}
|
| 8073 | 42 |
function PHYSFS_init(argv0: PChar) : LongInt; cdecl; external PhysfsLibName; |
43 |
function PHYSFS_deinit() : LongInt; cdecl; external PhysfsLibName; |
|
| 8839 | 44 |
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
|
45 |
function PHYSFSRWOPS_openWrite(fname: PChar): PSDL_RWops; cdecl; external PhyslayerLibName; |
| 7959 | 46 |
|
| 8073 | 47 |
function PHYSFS_mount(newDir, mountPoint: PChar; appendToPath: LongBool) : LongInt; cdecl; external PhysfsLibName; |
48 |
function PHYSFS_openRead(fname: PChar): PFSFile; cdecl; external PhysfsLibName; |
|
49 |
function PHYSFS_eof(f: PFSFile): LongBool; cdecl; external PhysfsLibName; |
|
50 |
function PHYSFS_readBytes(f: PFSFile; buffer: pointer; len: Int64): Int64; cdecl; external PhysfsLibName; |
|
51 |
function PHYSFS_close(f: PFSFile): LongBool; cdecl; external PhysfsLibName; |
|
52 |
function PHYSFS_exists(fname: PChar): LongBool; cdecl; external PhysfsLibName; |
|
| 7959 | 53 |
|
|
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
|
54 |
procedure hedgewarsMountPackages(); cdecl; external PhyslayerLibName; |
| 8105 | 55 |
{$ENDIF}
|
56 |
||
|
8099
a7f02b902b6f
throw in some 'nots' trying to restore pas2c functionality
koda
parents:
8080
diff
changeset
|
57 |
(*****************************************************************) |
| 8052 | 58 |
|
| 8025 | 59 |
function rwopsOpenRead(fname: shortstring): PSDL_RWops; |
60 |
begin |
|
61 |
exit(PHYSFSRWOPS_openRead(Str2PChar(fname))); |
|
62 |
end; |
|
63 |
||
64 |
function rwopsOpenWrite(fname: shortstring): PSDL_RWops; |
|
| 7959 | 65 |
begin |
| 8025 | 66 |
exit(PHYSFSRWOPS_openWrite(Str2PChar(fname))); |
67 |
end; |
|
| 8022 | 68 |
|
| 8028 | 69 |
function pfsOpenRead(fname: shortstring): PFSFile; |
70 |
begin |
|
71 |
exit(PHYSFS_openRead(Str2PChar(fname))); |
|
72 |
end; |
|
73 |
||
74 |
function pfsEOF(f: PFSFile): boolean; |
|
75 |
begin |
|
76 |
exit(PHYSFS_eof(f)) |
|
77 |
end; |
|
78 |
||
79 |
function pfsClose(f: PFSFile): boolean; |
|
80 |
begin |
|
81 |
exit(PHYSFS_close(f)) |
|
82 |
end; |
|
83 |
||
| 8031 | 84 |
function pfsExists(fname: shortstring): boolean; |
85 |
begin |
|
86 |
exit(PHYSFS_exists(Str2PChar(fname))) |
|
87 |
end; |
|
88 |
||
| 8028 | 89 |
|
90 |
procedure pfsReadLn(f: PFSFile; var s: shortstring); |
|
91 |
var c: char; |
|
92 |
begin |
|
93 |
s[0]:= #0; |
|
94 |
||
| 8034 | 95 |
while (PHYSFS_readBytes(f, @c, 1) = 1) and (c <> #10) do |
| 8028 | 96 |
if (c <> #13) and (s[0] < #255) then |
97 |
begin |
|
98 |
inc(s[0]); |
|
99 |
s[byte(s[0])]:= c |
|
100 |
end |
|
101 |
end; |
|
102 |
||
| 8107 | 103 |
procedure pfsReadLnA(f: PFSFile; var s: ansistring); |
104 |
var c: char; |
|
105 |
b: shortstring; |
|
106 |
begin |
|
107 |
s:= ''; |
|
108 |
b[0]:= #0; |
|
109 |
||
110 |
while (PHYSFS_readBytes(f, @c, 1) = 1) and (c <> #10) do |
|
111 |
if (c <> #13) then |
|
112 |
begin |
|
113 |
inc(b[0]); |
|
114 |
b[byte(b[0])]:= c; |
|
115 |
if b[0] = #255 then |
|
116 |
begin |
|
117 |
s:= s + b; |
|
118 |
b[0]:= #0 |
|
119 |
end |
|
120 |
end; |
|
| 8330 | 121 |
|
| 8107 | 122 |
s:= s + b |
123 |
end; |
|
124 |
||
| 8031 | 125 |
function pfsBlockRead(f: PFSFile; buf: pointer; size: Int64): Int64; |
126 |
var r: Int64; |
|
127 |
begin |
|
| 8034 | 128 |
r:= PHYSFS_readBytes(f, buf, size); |
| 8031 | 129 |
|
130 |
if r <= 0 then |
|
131 |
pfsBlockRead:= 0 |
|
132 |
else |
|
133 |
pfsBlockRead:= r |
|
134 |
end; |
|
135 |
||
| 8025 | 136 |
procedure initModule; |
137 |
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
|
138 |
cPhysfsId: shortstring; |
| 8025 | 139 |
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
|
140 |
{$IFDEF HWLIBRARY}
|
|
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
|
141 |
//TODO: http://icculus.org/pipermail/physfs/2011-August/001006.html |
|
9378
2be457289e60
update physlayer and sdl bindings to the new rwops interface
koda
parents:
9224
diff
changeset
|
142 |
cPhysfsId:= 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
|
143 |
{$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
|
144 |
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
|
145 |
{$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
|
146 |
|
|
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
|
147 |
i:= PHYSFS_init(Str2PChar(cPhysfsId)); |
| 8025 | 148 |
AddFileLog('[PhysFS] init: ' + inttostr(i));
|
149 |
||
| 8714 | 150 |
i:= PHYSFS_mount(Str2PChar(PathPrefix), nil, false); |
| 8025 | 151 |
AddFileLog('[PhysFS] mount ' + PathPrefix + ': ' + inttostr(i));
|
|
9531
7fcdedc45589
Unbreak access to Data dir in profile broken in r8b48c27201af
unc0rr
parents:
9466
diff
changeset
|
152 |
i:= PHYSFS_mount(Str2PChar(UserPathPrefix + '/Data'), nil, false); |
|
7fcdedc45589
Unbreak access to Data dir in profile broken in r8b48c27201af
unc0rr
parents:
9466
diff
changeset
|
153 |
AddFileLog('[PhysFS] mount ' + UserPathPrefix + '/Data: ' + inttostr(i));
|
| 8052 | 154 |
|
155 |
hedgewarsMountPackages; |
|
|
9531
7fcdedc45589
Unbreak access to Data dir in profile broken in r8b48c27201af
unc0rr
parents:
9466
diff
changeset
|
156 |
|
|
7fcdedc45589
Unbreak access to Data dir in profile broken in r8b48c27201af
unc0rr
parents:
9466
diff
changeset
|
157 |
i:= PHYSFS_mount(Str2PChar(UserPathPrefix), nil, false); |
|
7fcdedc45589
Unbreak access to Data dir in profile broken in r8b48c27201af
unc0rr
parents:
9466
diff
changeset
|
158 |
// need access to teams and frontend configs (for bindings) |
|
7fcdedc45589
Unbreak access to Data dir in profile broken in r8b48c27201af
unc0rr
parents:
9466
diff
changeset
|
159 |
AddFileLog('[PhysFS] mount ' + UserPathPrefix + ': ' + inttostr(i));
|
| 7959 | 160 |
end; |
161 |
||
162 |
procedure freeModule; |
|
163 |
begin |
|
164 |
PHYSFS_deinit; |
|
165 |
end; |
|
166 |
||
167 |
end. |