author | Wuzzy <Wuzzy2@mail.ru> |
Tue, 04 Dec 2018 16:48:43 +0100 | |
branch | 0.9.25 |
changeset 14369 | 02841325495e |
parent 13972 | a04c86dc685f |
child 14866 | acb0526bf458 |
permissions | -rw-r--r-- |
184 | 1 |
(* |
1066 | 2 |
* Hedgewars, a free turn based strategy game |
11046 | 3 |
* Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com> |
184 | 4 |
* |
5 |
* This program is free software; you can redistribute it and/or modify |
|
6 |
* it under the terms of the GNU General Public License as published by |
|
7 |
* the Free Software Foundation; version 2 of the License |
|
8 |
* |
|
9 |
* This program is distributed in the hope that it will be useful, |
|
10 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
11 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
12 |
* GNU General Public License for more details. |
|
13 |
* |
|
14 |
* You should have received a copy of the GNU General Public License |
|
15 |
* along with this program; if not, write to the Free Software |
|
10108
c68cf030eded
update FSF address. note: two sdl include files (by Sam Lantinga) still have the old FSF address in their copyright - but I ain't gonna touch their copyright headers
sheepluva
parents:
10105
diff
changeset
|
16 |
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
184 | 17 |
*) |
18 |
||
2630 | 19 |
{$INCLUDE "options.inc"} |
20 |
||
184 | 21 |
unit uLocale; |
22 |
interface |
|
4361 | 23 |
uses uTypes; |
2863 | 24 |
|
12466
e29a4238dc19
Increase maximum event string message count to 255
Wuzzy <almikes@aol.com>
parents:
11807
diff
changeset
|
25 |
const MAX_EVENT_STRINGS = 255; |
184 | 26 |
|
2905 | 27 |
procedure LoadLocale(FileName: shortstring); |
10122
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
28 |
function GetEventString(e: TEventId): ansistring; |
2140 | 29 |
|
13837
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
30 |
function Format(fmt: shortstring; arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9: shortstring; argCount: Byte): shortstring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
31 |
function Format(fmt: shortstring; arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9: shortstring): shortstring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
32 |
function Format(fmt: shortstring; arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8: shortstring): shortstring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
33 |
function Format(fmt: shortstring; arg1, arg2, arg3, arg4, arg5, arg6, arg7: shortstring): shortstring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
34 |
function Format(fmt: shortstring; arg1, arg2, arg3, arg4, arg5, arg6: shortstring): shortstring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
35 |
function Format(fmt: shortstring; arg1, arg2, arg3, arg4, arg5: shortstring): shortstring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
36 |
function Format(fmt: shortstring; arg1, arg2, arg3, arg4: shortstring): shortstring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
37 |
function Format(fmt: shortstring; arg1, arg2, arg3: shortstring): shortstring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
38 |
function Format(fmt: shortstring; arg1, arg2: shortstring): shortstring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
39 |
function Format(fmt: shortstring; arg1: shortstring): shortstring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
40 |
function FormatA(fmt: ansistring; arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9: ansistring; argCount: Byte): ansistring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
41 |
function FormatA(fmt: ansistring; arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9: ansistring): ansistring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
42 |
function FormatA(fmt: ansistring; arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8: ansistring): ansistring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
43 |
function FormatA(fmt: ansistring; arg1, arg2, arg3, arg4, arg5, arg6, arg7: ansistring): ansistring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
44 |
function FormatA(fmt: ansistring; arg1, arg2, arg3, arg4, arg5, arg6: ansistring): ansistring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
45 |
function FormatA(fmt: ansistring; arg1, arg2, arg3, arg4, arg5: ansistring): ansistring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
46 |
function FormatA(fmt: ansistring; arg1, arg2, arg3, arg4: ansistring): ansistring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
47 |
function FormatA(fmt: ansistring; arg1, arg2, arg3: ansistring): ansistring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
48 |
function FormatA(fmt: ansistring; arg1, arg2: ansistring): ansistring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
49 |
function FormatA(fmt: ansistring; arg1: ansistring): ansistring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
50 |
|
7048
0a4c88935902
the ios port runs again, although with a few things to sort out
koda
parents:
6700
diff
changeset
|
51 |
{$IFDEF HWLIBRARY} |
11795
ac93cfc17365
- Pass also userPath to LoadLocaleWrapper
antonc27 <antonc27@mail.ru>
parents:
11689
diff
changeset
|
52 |
procedure LoadLocaleWrapper(path: pchar; userpath: pchar; filename: pchar); cdecl; export; |
7048
0a4c88935902
the ios port runs again, although with a few things to sort out
koda
parents:
6700
diff
changeset
|
53 |
{$ENDIF} |
0a4c88935902
the ios port runs again, although with a few things to sort out
koda
parents:
6700
diff
changeset
|
54 |
|
184 | 55 |
implementation |
10122
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
56 |
uses uRandom, uUtils, uVariables, uDebug, uPhysFSLayer; |
2142 | 57 |
|
10122
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
58 |
var trevt: array[TEventId] of array [0..Pred(MAX_EVENT_STRINGS)] of ansistring; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2908
diff
changeset
|
59 |
trevt_n: array[TEventId] of integer; |
184 | 60 |
|
2905 | 61 |
procedure LoadLocale(FileName: shortstring); |
10127 | 62 |
var s: ansistring; |
8028 | 63 |
f: pfsFile; |
371 | 64 |
a, b, c: LongInt; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2908
diff
changeset
|
65 |
first: array[TEventId] of boolean; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2908
diff
changeset
|
66 |
e: TEventId; |
184 | 67 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6528
diff
changeset
|
68 |
for e:= Low(TEventId) to High(TEventId) do |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6528
diff
changeset
|
69 |
first[e]:= true; |
2140 | 70 |
|
8028 | 71 |
f:= pfsOpenRead(FileName); |
11537 | 72 |
checkFails(f <> nil, 'Cannot load locale "' + FileName + '"', false); |
8028 | 73 |
|
10249 | 74 |
s:= ''; |
75 |
||
8028 | 76 |
if f <> nil then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6528
diff
changeset
|
77 |
begin |
8028 | 78 |
while not pfsEof(f) do |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6528
diff
changeset
|
79 |
begin |
8107 | 80 |
pfsReadLnA(f, s); |
10122
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
81 |
if Length(s) = 0 then |
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
82 |
continue; |
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
83 |
if (s[1] < '0') or (s[1] > '9') then |
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
84 |
continue; |
11537 | 85 |
checkFails(Length(s) > 6, 'Load locale: empty string', true); |
10127 | 86 |
{$IFNDEF PAS2C} |
10122
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
87 |
val(s[1]+s[2], a, c); |
11537 | 88 |
checkFails(c = 0, ansistring('Load locale: numbers should be two-digit: ') + s, true); |
10122
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
89 |
val(s[4]+s[5], b, c); |
11537 | 90 |
checkFails(c = 0, ansistring('Load locale: numbers should be two-digit: ') + s, true); |
10127 | 91 |
{$ELSE} |
92 |
val(s[1]+s[2], a); |
|
93 |
val(s[4]+s[5], b); |
|
94 |
{$ENDIF} |
|
11537 | 95 |
checkFails(s[3] = ':', 'Load locale: ":" expected', true); |
96 |
checkFails(s[6] = '=', 'Load locale: "=" expected', true); |
|
97 |
if not allOK then exit; |
|
10122
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
98 |
Delete(s, 1, 6); |
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
99 |
case a of |
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
100 |
0: if (b >=0) and (b <= ord(High(TAmmoStrId))) then |
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
101 |
trammo[TAmmoStrId(b)]:= s; |
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
102 |
1: if (b >=0) and (b <= ord(High(TMsgStrId))) then |
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
103 |
trmsg[TMsgStrId(b)]:= s; |
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
104 |
2: if (b >=0) and (b <= ord(High(TEventId))) then |
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
105 |
begin |
11537 | 106 |
checkFails(trevt_n[TEventId(b)] < MAX_EVENT_STRINGS, 'Too many event strings in ' + IntToStr(a) + ':' + IntToStr(b), false); |
10122
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
107 |
if first[TEventId(b)] then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6528
diff
changeset
|
108 |
begin |
10122
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
109 |
trevt_n[TEventId(b)]:= 0; |
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
110 |
first[TEventId(b)]:= false; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6528
diff
changeset
|
111 |
end; |
10122
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
112 |
trevt[TEventId(b)][trevt_n[TEventId(b)]]:= s; |
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
113 |
inc(trevt_n[TEventId(b)]); |
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
114 |
end; |
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
115 |
3: if (b >=0) and (b <= ord(High(TAmmoStrId))) then |
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
116 |
trammoc[TAmmoStrId(b)]:= s; |
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
117 |
4: if (b >=0) and (b <= ord(High(TAmmoStrId))) then |
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
118 |
trammod[TAmmoStrId(b)]:= s; |
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
119 |
5: if (b >=0) and (b <= ord(High(TGoalStrId))) then |
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
120 |
trgoal[TGoalStrId(b)]:= s; |
13462 | 121 |
6: if (b >=0) and (b <= ord(High(TCmdHelpStrId))) then |
122 |
trcmd[TCmdHelpStrId(b)]:= s; |
|
10122
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
123 |
end; |
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
124 |
end; |
8028 | 125 |
pfsClose(f); |
2722 | 126 |
end; |
184 | 127 |
end; |
128 |
||
10122
cefede760264
Revert 88929358d2e1 in favor of ansistrings implementation in pas2c
unc0rr
parents:
10116
diff
changeset
|
129 |
function GetEventString(e: TEventId): ansistring; |
2140 | 130 |
begin |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2908
diff
changeset
|
131 |
if trevt_n[e] = 0 then // no messages for this event type? |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2908
diff
changeset
|
132 |
GetEventString:= '*missing translation*' |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2908
diff
changeset
|
133 |
else |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2908
diff
changeset
|
134 |
GetEventString:= trevt[e][GetRandom(trevt_n[e])]; // Pick a random message and return it |
2140 | 135 |
end; |
136 |
||
13048
9119726e22bc
Engine: Allow to use up to 9 placeholders in Format and FormatA
Wuzzy <Wuzzy2@mail.ru>
parents:
12466
diff
changeset
|
137 |
// Format the string fmt. |
13837
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
138 |
// Take a shortstring with placeholders %1, %2, %3, ... %9. and replace |
13048
9119726e22bc
Engine: Allow to use up to 9 placeholders in Format and FormatA
Wuzzy <Wuzzy2@mail.ru>
parents:
12466
diff
changeset
|
139 |
// them with the corresponding elements of an array with up to |
13837
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
140 |
// argCount. ArgCount must not be larger than 9. |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
141 |
// Each placeholder must be used exactly once and numbers MUST NOT be |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
142 |
// skipped (e.g. using %1 and %3 but not %2. |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
143 |
function Format(fmt: shortstring; arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9: shortstring; argCount: Byte): shortstring; |
13048
9119726e22bc
Engine: Allow to use up to 9 placeholders in Format and FormatA
Wuzzy <Wuzzy2@mail.ru>
parents:
12466
diff
changeset
|
144 |
var i, p: LongInt; |
13837
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
145 |
tempstr, curArg: shortstring; |
184 | 146 |
begin |
13048
9119726e22bc
Engine: Allow to use up to 9 placeholders in Format and FormatA
Wuzzy <Wuzzy2@mail.ru>
parents:
12466
diff
changeset
|
147 |
tempstr:= fmt; |
13837
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
148 |
for i:=0 to argCount - 1 do |
13048
9119726e22bc
Engine: Allow to use up to 9 placeholders in Format and FormatA
Wuzzy <Wuzzy2@mail.ru>
parents:
12466
diff
changeset
|
149 |
begin |
13837
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
150 |
case i of |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
151 |
0: curArg:= arg1; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
152 |
1: curArg:= arg2; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
153 |
2: curArg:= arg3; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
154 |
3: curArg:= arg4; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
155 |
4: curArg:= arg5; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
156 |
5: curArg:= arg6; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
157 |
6: curArg:= arg7; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
158 |
7: curArg:= arg8; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
159 |
8: curArg:= arg9; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
160 |
end; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
161 |
|
13972
a04c86dc685f
Allow duplicate placeholders in engine strings
Wuzzy <Wuzzy2@mail.ru>
parents:
13885
diff
changeset
|
162 |
repeat |
13162
c5453cbdeb87
uLocale: Fix broken Format function
Wuzzy <Wuzzy2@mail.ru>
parents:
13048
diff
changeset
|
163 |
p:= Pos('%'+IntToStr(i+1), tempstr); |
13972
a04c86dc685f
Allow duplicate placeholders in engine strings
Wuzzy <Wuzzy2@mail.ru>
parents:
13885
diff
changeset
|
164 |
if (p <> 0) then |
13048
9119726e22bc
Engine: Allow to use up to 9 placeholders in Format and FormatA
Wuzzy <Wuzzy2@mail.ru>
parents:
12466
diff
changeset
|
165 |
begin |
9119726e22bc
Engine: Allow to use up to 9 placeholders in Format and FormatA
Wuzzy <Wuzzy2@mail.ru>
parents:
12466
diff
changeset
|
166 |
delete(tempstr, p, 2); |
13837
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
167 |
insert(curArg, tempstr, p); |
13048
9119726e22bc
Engine: Allow to use up to 9 placeholders in Format and FormatA
Wuzzy <Wuzzy2@mail.ru>
parents:
12466
diff
changeset
|
168 |
end; |
13972
a04c86dc685f
Allow duplicate placeholders in engine strings
Wuzzy <Wuzzy2@mail.ru>
parents:
13885
diff
changeset
|
169 |
until (p = 0); |
13048
9119726e22bc
Engine: Allow to use up to 9 placeholders in Format and FormatA
Wuzzy <Wuzzy2@mail.ru>
parents:
12466
diff
changeset
|
170 |
end; |
9119726e22bc
Engine: Allow to use up to 9 placeholders in Format and FormatA
Wuzzy <Wuzzy2@mail.ru>
parents:
12466
diff
changeset
|
171 |
Format:= tempstr; |
184 | 172 |
end; |
173 |
||
13048
9119726e22bc
Engine: Allow to use up to 9 placeholders in Format and FormatA
Wuzzy <Wuzzy2@mail.ru>
parents:
12466
diff
changeset
|
174 |
// Same as Format, but for ansistring |
13837
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
175 |
function FormatA(fmt: ansistring; arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9: ansistring; argCount: Byte): ansistring; |
13048
9119726e22bc
Engine: Allow to use up to 9 placeholders in Format and FormatA
Wuzzy <Wuzzy2@mail.ru>
parents:
12466
diff
changeset
|
176 |
var i, p: LongInt; |
13837
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
177 |
tempstr, curArg: ansistring; |
2905 | 178 |
begin |
13048
9119726e22bc
Engine: Allow to use up to 9 placeholders in Format and FormatA
Wuzzy <Wuzzy2@mail.ru>
parents:
12466
diff
changeset
|
179 |
tempstr:= fmt; |
13837
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
180 |
for i:=0 to argCount - 1 do |
13048
9119726e22bc
Engine: Allow to use up to 9 placeholders in Format and FormatA
Wuzzy <Wuzzy2@mail.ru>
parents:
12466
diff
changeset
|
181 |
begin |
13837
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
182 |
case i of |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
183 |
0: curArg:= arg1; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
184 |
1: curArg:= arg2; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
185 |
2: curArg:= arg3; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
186 |
3: curArg:= arg4; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
187 |
4: curArg:= arg5; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
188 |
5: curArg:= arg6; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
189 |
6: curArg:= arg7; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
190 |
7: curArg:= arg8; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
191 |
8: curArg:= arg9; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
192 |
end; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
193 |
|
13972
a04c86dc685f
Allow duplicate placeholders in engine strings
Wuzzy <Wuzzy2@mail.ru>
parents:
13885
diff
changeset
|
194 |
repeat |
13048
9119726e22bc
Engine: Allow to use up to 9 placeholders in Format and FormatA
Wuzzy <Wuzzy2@mail.ru>
parents:
12466
diff
changeset
|
195 |
p:= Pos('%'+IntToStr(i+1), tempstr); |
13972
a04c86dc685f
Allow duplicate placeholders in engine strings
Wuzzy <Wuzzy2@mail.ru>
parents:
13885
diff
changeset
|
196 |
if (p <> 0) then |
13048
9119726e22bc
Engine: Allow to use up to 9 placeholders in Format and FormatA
Wuzzy <Wuzzy2@mail.ru>
parents:
12466
diff
changeset
|
197 |
begin |
9119726e22bc
Engine: Allow to use up to 9 placeholders in Format and FormatA
Wuzzy <Wuzzy2@mail.ru>
parents:
12466
diff
changeset
|
198 |
delete(tempstr, p, 2); |
13837
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
199 |
insert(curArg, tempstr, p); |
13048
9119726e22bc
Engine: Allow to use up to 9 placeholders in Format and FormatA
Wuzzy <Wuzzy2@mail.ru>
parents:
12466
diff
changeset
|
200 |
end; |
13972
a04c86dc685f
Allow duplicate placeholders in engine strings
Wuzzy <Wuzzy2@mail.ru>
parents:
13885
diff
changeset
|
201 |
until (p = 0); |
13048
9119726e22bc
Engine: Allow to use up to 9 placeholders in Format and FormatA
Wuzzy <Wuzzy2@mail.ru>
parents:
12466
diff
changeset
|
202 |
end; |
9119726e22bc
Engine: Allow to use up to 9 placeholders in Format and FormatA
Wuzzy <Wuzzy2@mail.ru>
parents:
12466
diff
changeset
|
203 |
FormatA:= tempstr; |
9119726e22bc
Engine: Allow to use up to 9 placeholders in Format and FormatA
Wuzzy <Wuzzy2@mail.ru>
parents:
12466
diff
changeset
|
204 |
end; |
9119726e22bc
Engine: Allow to use up to 9 placeholders in Format and FormatA
Wuzzy <Wuzzy2@mail.ru>
parents:
12466
diff
changeset
|
205 |
|
13837
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
206 |
// The following functions are just shortcuts of Format/FormatA, with fewer argument counts |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
207 |
function Format(fmt: shortstring; arg1: shortstring): shortstring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
208 |
begin |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
209 |
Format:= Format(fmt, arg1, '', '', '', '', '', '', '', '', 1); |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
210 |
end; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
211 |
function Format(fmt: shortstring; arg1, arg2: shortstring): shortstring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
212 |
begin |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
213 |
Format:= Format(fmt, arg1, arg2, '', '', '', '', '', '', '', 2); |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
214 |
end; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
215 |
function Format(fmt: shortstring; arg1, arg2, arg3: shortstring): shortstring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
216 |
begin |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
217 |
Format:= Format(fmt, arg1, arg2, arg3, '', '', '', '', '', '', 3); |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
218 |
end; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
219 |
function Format(fmt: shortstring; arg1, arg2, arg3, arg4: shortstring): shortstring; |
13048
9119726e22bc
Engine: Allow to use up to 9 placeholders in Format and FormatA
Wuzzy <Wuzzy2@mail.ru>
parents:
12466
diff
changeset
|
220 |
begin |
13837
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
221 |
Format:= Format(fmt, arg1, arg2, arg3, arg4, '', '', '', '', '', 4); |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
222 |
end; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
223 |
function Format(fmt: shortstring; arg1, arg2, arg3, arg4, arg5: shortstring): shortstring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
224 |
begin |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
225 |
Format:= Format(fmt, arg1, arg2, arg3, arg4, arg5, '', '', '', '', 5); |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
226 |
end; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
227 |
function Format(fmt: shortstring; arg1, arg2, arg3, arg4, arg5, arg6: shortstring): shortstring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
228 |
begin |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
229 |
Format:= Format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, '', '', '', 6); |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
230 |
end; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
231 |
function Format(fmt: shortstring; arg1, arg2, arg3, arg4, arg5, arg6, arg7: shortstring): shortstring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
232 |
begin |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
233 |
Format:= Format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, '', '', 7); |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
234 |
end; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
235 |
function Format(fmt: shortstring; arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8: shortstring): shortstring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
236 |
begin |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
237 |
Format:= Format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, '', 8); |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
238 |
end; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
239 |
function Format(fmt: shortstring; arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9: shortstring): shortstring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
240 |
begin |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
241 |
Format:= Format(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, 9); |
13048
9119726e22bc
Engine: Allow to use up to 9 placeholders in Format and FormatA
Wuzzy <Wuzzy2@mail.ru>
parents:
12466
diff
changeset
|
242 |
end; |
9119726e22bc
Engine: Allow to use up to 9 placeholders in Format and FormatA
Wuzzy <Wuzzy2@mail.ru>
parents:
12466
diff
changeset
|
243 |
|
13837
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
244 |
function FormatA(fmt: ansistring; arg1: ansistring): ansistring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
245 |
begin |
13882 | 246 |
FormatA:= FormatA(fmt, arg1, ansistring(''), ansistring(''), ansistring(''), ansistring(''), ansistring(''), ansistring(''), ansistring(''), ansistring(''), 1); |
13837
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
247 |
end; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
248 |
function FormatA(fmt: ansistring; arg1, arg2: ansistring): ansistring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
249 |
begin |
13882 | 250 |
FormatA:= FormatA(fmt, arg1, arg2, ansistring(''), ansistring(''), ansistring(''), ansistring(''), ansistring(''), ansistring(''), ansistring(''), 2); |
13837
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
251 |
end; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
252 |
function FormatA(fmt: ansistring; arg1, arg2, arg3: ansistring): ansistring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
253 |
begin |
13882 | 254 |
FormatA:= FormatA(fmt, arg1, arg2, arg3, ansistring(''), ansistring(''), ansistring(''), ansistring(''), ansistring(''), ansistring(''), 3); |
13837
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
255 |
end; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
256 |
function FormatA(fmt: ansistring; arg1, arg2, arg3, arg4: ansistring): ansistring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
257 |
begin |
13882 | 258 |
FormatA:= FormatA(fmt, arg1, arg2, arg3, arg4, ansistring(''), ansistring(''), ansistring(''), ansistring(''), ansistring(''), 4); |
13837
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
259 |
end; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
260 |
function FormatA(fmt: ansistring; arg1, arg2, arg3, arg4, arg5: ansistring): ansistring; |
13048
9119726e22bc
Engine: Allow to use up to 9 placeholders in Format and FormatA
Wuzzy <Wuzzy2@mail.ru>
parents:
12466
diff
changeset
|
261 |
begin |
13882 | 262 |
FormatA:= FormatA(fmt, arg1, arg2, arg3, arg4, arg5, ansistring(''), ansistring(''), ansistring(''), ansistring(''), 5); |
13837
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
263 |
end; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
264 |
function FormatA(fmt: ansistring; arg1, arg2, arg3, arg4, arg5, arg6: ansistring): ansistring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
265 |
begin |
13882 | 266 |
FormatA:= FormatA(fmt, arg1, arg2, arg3, arg4, arg5, arg6, ansistring(''), ansistring(''), ansistring(''), 6); |
13837
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
267 |
end; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
268 |
function FormatA(fmt: ansistring; arg1, arg2, arg3, arg4, arg5, arg6, arg7: ansistring): ansistring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
269 |
begin |
13882 | 270 |
FormatA:= FormatA(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, ansistring(''), ansistring(''), 7); |
13837
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
271 |
end; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
272 |
function FormatA(fmt: ansistring; arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8: ansistring): ansistring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
273 |
begin |
13882 | 274 |
FormatA:= FormatA(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, ansistring(''), 8); |
13837
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
275 |
end; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
276 |
function FormatA(fmt: ansistring; arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9: ansistring): ansistring; |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
277 |
begin |
10a3b80130b5
Change syntax for Format/FormatA, remove array in function to be friendlier to Pas2C
Wuzzy <Wuzzy2@mail.ru>
parents:
13462
diff
changeset
|
278 |
FormatA:= FormatA(fmt, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, 9); |
2905 | 279 |
end; |
280 |
||
7048
0a4c88935902
the ios port runs again, although with a few things to sort out
koda
parents:
6700
diff
changeset
|
281 |
{$IFDEF HWLIBRARY} |
11795
ac93cfc17365
- Pass also userPath to LoadLocaleWrapper
antonc27 <antonc27@mail.ru>
parents:
11689
diff
changeset
|
282 |
procedure LoadLocaleWrapper(path: pchar; userpath: pchar; filename: pchar); cdecl; export; |
3926
668b71f31e51
use dynamic data from engine instead of using hardcoded values
koda
parents:
3774
diff
changeset
|
283 |
begin |
11141
01e8e5a6a8c1
- Fix for crash on loading SingleWeaponViewController in Settings
antonc27 <antonc27@mail.ru>
parents:
10249
diff
changeset
|
284 |
PathPrefix := Strpas(path); |
11795
ac93cfc17365
- Pass also userPath to LoadLocaleWrapper
antonc27 <antonc27@mail.ru>
parents:
11689
diff
changeset
|
285 |
UserPathPrefix := Strpas(userpath); |
11141
01e8e5a6a8c1
- Fix for crash on loading SingleWeaponViewController in Settings
antonc27 <antonc27@mail.ru>
parents:
10249
diff
changeset
|
286 |
|
11795
ac93cfc17365
- Pass also userPath to LoadLocaleWrapper
antonc27 <antonc27@mail.ru>
parents:
11689
diff
changeset
|
287 |
//normally this var set in preInit of engine |
ac93cfc17365
- Pass also userPath to LoadLocaleWrapper
antonc27 <antonc27@mail.ru>
parents:
11689
diff
changeset
|
288 |
allOK := true; |
ac93cfc17365
- Pass also userPath to LoadLocaleWrapper
antonc27 <antonc27@mail.ru>
parents:
11689
diff
changeset
|
289 |
|
11807
975c130c3901
- Don't forget to init uVaribles inside LoadLocaleWrapper call
antonc27 <antonc27@mail.ru>
parents:
11795
diff
changeset
|
290 |
uVariables.initModule; |
975c130c3901
- Don't forget to init uVaribles inside LoadLocaleWrapper call
antonc27 <antonc27@mail.ru>
parents:
11795
diff
changeset
|
291 |
|
11689 | 292 |
PathPrefix:= PathPrefix + #0; |
293 |
UserPathPrefix:= UserPathPrefix + #0; |
|
294 |
uPhysFSLayer.initModule(@PathPrefix[1], @UserPathPrefix[1]); |
|
295 |
PathPrefix:= copy(PathPrefix, 1, length(PathPrefix) - 1); |
|
296 |
UserPathPrefix:= copy(UserPathPrefix, 1, length(UserPathPrefix) - 1); |
|
11141
01e8e5a6a8c1
- Fix for crash on loading SingleWeaponViewController in Settings
antonc27 <antonc27@mail.ru>
parents:
10249
diff
changeset
|
297 |
|
01e8e5a6a8c1
- Fix for crash on loading SingleWeaponViewController in Settings
antonc27 <antonc27@mail.ru>
parents:
10249
diff
changeset
|
298 |
LoadLocale(Strpas(filename)); |
01e8e5a6a8c1
- Fix for crash on loading SingleWeaponViewController in Settings
antonc27 <antonc27@mail.ru>
parents:
10249
diff
changeset
|
299 |
|
01e8e5a6a8c1
- Fix for crash on loading SingleWeaponViewController in Settings
antonc27 <antonc27@mail.ru>
parents:
10249
diff
changeset
|
300 |
uPhysFSLayer.freeModule; |
11807
975c130c3901
- Don't forget to init uVaribles inside LoadLocaleWrapper call
antonc27 <antonc27@mail.ru>
parents:
11795
diff
changeset
|
301 |
uVariables.freeModule; |
3926
668b71f31e51
use dynamic data from engine instead of using hardcoded values
koda
parents:
3774
diff
changeset
|
302 |
end; |
7048
0a4c88935902
the ios port runs again, although with a few things to sort out
koda
parents:
6700
diff
changeset
|
303 |
{$ENDIF} |
3926
668b71f31e51
use dynamic data from engine instead of using hardcoded values
koda
parents:
3774
diff
changeset
|
304 |
|
184 | 305 |
end. |