author | Wuzzy <Wuzzy2@mail.ru> |
Thu, 18 Jul 2019 18:45:30 +0200 | |
changeset 15274 | 000d3262244c |
parent 15156 | 7a8cc8bc963e |
child 15908 | 014f4edd0421 |
child 16048 | eb015d6b4a2a |
permissions | -rw-r--r-- |
4 | 1 |
(* |
1066 | 2 |
* Hedgewars, a free turn based strategy game |
11046 | 3 |
* Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com> |
4 | 4 |
* |
183 | 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 |
|
4 | 8 |
* |
183 | 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. |
|
4 | 13 |
* |
183 | 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:
10015
diff
changeset
|
16 |
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
4 | 17 |
*) |
18 |
||
2630 | 19 |
{$INCLUDE "options.inc"} |
20 |
||
4 | 21 |
unit uIO; |
22 |
interface |
|
4376 | 23 |
uses SDLh, uTypes; |
4 | 24 |
|
3038 | 25 |
procedure initModule; |
26 |
procedure freeModule; |
|
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2699
diff
changeset
|
27 |
|
7026
8d1724e1337e
split OnDestroy across the appropriate modules (this doen't cause leaks on mobile, right?)
koda
parents:
6982
diff
changeset
|
28 |
procedure InitIPC; |
4 | 29 |
procedure SendIPC(s: shortstring); |
8003 | 30 |
procedure SendIPCXY(cmd: char; X, Y: LongInt); |
155
401f4ea24715
Engine can generate land preview and send it via IPC
unc0rr
parents:
154
diff
changeset
|
31 |
procedure SendIPCRaw(p: pointer; len: Longword); |
4 | 32 |
procedure SendIPCAndWaitReply(s: shortstring); |
8472
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
33 |
procedure FlushMessages(Lag: Longword); |
1888
e76274ce7365
Add an ability to run engine without IPC connection.
unc0rr
parents:
1821
diff
changeset
|
34 |
procedure LoadRecordFromFile(fileName: shortstring); |
4376 | 35 |
procedure SendStat(sit: TStatInfoType; s: shortstring); |
159 | 36 |
procedure IPCWaitPongEvent; |
4 | 37 |
procedure IPCCheckSock; |
38 |
procedure NetGetNextCmd; |
|
4414 | 39 |
procedure doPut(putX, putY: LongInt; fromAI: boolean); |
4 | 40 |
|
41 |
implementation |
|
15114
8cb1eebee4a0
Properly prevent using airstrike or girder in mid-air
Wuzzy <Wuzzy2@mail.ru>
parents:
14535
diff
changeset
|
42 |
uses uConsole, uConsts, uVariables, uCommands, uUtils, uDebug, uLocale, uSound; |
648
fc5234aa6493
Use list instead of array (no limit for network packets amount)
unc0rr
parents:
526
diff
changeset
|
43 |
|
8145
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8024
diff
changeset
|
44 |
const |
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8024
diff
changeset
|
45 |
cSendEmptyPacketTime = 1000; |
8472
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
46 |
cSendBufferSize = 1024; |
8145
6408c0ba4ba1
Move global variables to units that use them
Joe Doyle (Ginto8) <ginto8@gmail.com>
parents:
8024
diff
changeset
|
47 |
|
648
fc5234aa6493
Use list instead of array (no limit for network packets amount)
unc0rr
parents:
526
diff
changeset
|
48 |
type PCmd = ^TCmd; |
fc5234aa6493
Use list instead of array (no limit for network packets amount)
unc0rr
parents:
526
diff
changeset
|
49 |
TCmd = packed record |
fc5234aa6493
Use list instead of array (no limit for network packets amount)
unc0rr
parents:
526
diff
changeset
|
50 |
Next: PCmd; |
2574
2f3e5c57359c
Fix (quite rare) spectators queue error when joining game with teams left the game.
unc0rr
parents:
2407
diff
changeset
|
51 |
loTime: Word; |
648
fc5234aa6493
Use list instead of array (no limit for network packets amount)
unc0rr
parents:
526
diff
changeset
|
52 |
case byte of |
fc5234aa6493
Use list instead of array (no limit for network packets amount)
unc0rr
parents:
526
diff
changeset
|
53 |
1: (len: byte; |
9972
feb4b031b52e
Remove X and Y from the structure since those are misaligned in c code and I failed to do anything about that and they were the last cause of desyncs and only used in 4 places and I'm too lazy
unc0rr
parents:
9521
diff
changeset
|
54 |
cmd: Char); |
648
fc5234aa6493
Use list instead of array (no limit for network packets amount)
unc0rr
parents:
526
diff
changeset
|
55 |
2: (str: shortstring); |
fc5234aa6493
Use list instead of array (no limit for network packets amount)
unc0rr
parents:
526
diff
changeset
|
56 |
end; |
fc5234aa6493
Use list instead of array (no limit for network packets amount)
unc0rr
parents:
526
diff
changeset
|
57 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
58 |
var IPCSock: PTCPSocket; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
59 |
fds: PSDLNet_SocketSet; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
60 |
isPonged: boolean; |
7028 | 61 |
SocketString: shortstring; |
4 | 62 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
63 |
headcmd: PCmd; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
64 |
lastcmd: PCmd; |
2382 | 65 |
|
8472
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
66 |
flushDelayTicks: LongWord; |
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
67 |
sendBuffer: record |
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
68 |
buf: array[0..Pred(cSendBufferSize)] of byte; |
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
69 |
count: Word; |
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
70 |
end; |
2382 | 71 |
|
2574
2f3e5c57359c
Fix (quite rare) spectators queue error when joining game with teams left the game.
unc0rr
parents:
2407
diff
changeset
|
72 |
function AddCmd(Time: Word; str: shortstring): PCmd; |
2695 | 73 |
var command: PCmd; |
648
fc5234aa6493
Use list instead of array (no limit for network packets amount)
unc0rr
parents:
526
diff
changeset
|
74 |
begin |
12894 | 75 |
if (lastcmd <> nil) |
76 |
and (lastcmd^.cmd = '+') // don't overwrite timestamped msg with non-timestamped one |
|
77 |
and (str[1] <> 'F') |
|
78 |
and (str[1] <> 'G') |
|
79 |
and (str[1] <> 's') |
|
80 |
and (str[1] <> 'h') |
|
81 |
and (str[1] <> 'b') |
|
82 |
then |
|
11483
dbc0d54798dc
Overwrite last '+' cmd in the queue instead of appending new command
unc0rr
parents:
11363
diff
changeset
|
83 |
begin |
dbc0d54798dc
Overwrite last '+' cmd in the queue instead of appending new command
unc0rr
parents:
11363
diff
changeset
|
84 |
command:= lastcmd; |
dbc0d54798dc
Overwrite last '+' cmd in the queue instead of appending new command
unc0rr
parents:
11363
diff
changeset
|
85 |
end else |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
86 |
begin |
11483
dbc0d54798dc
Overwrite last '+' cmd in the queue instead of appending new command
unc0rr
parents:
11363
diff
changeset
|
87 |
new(command); |
dbc0d54798dc
Overwrite last '+' cmd in the queue instead of appending new command
unc0rr
parents:
11363
diff
changeset
|
88 |
|
dbc0d54798dc
Overwrite last '+' cmd in the queue instead of appending new command
unc0rr
parents:
11363
diff
changeset
|
89 |
if headcmd = nil then |
dbc0d54798dc
Overwrite last '+' cmd in the queue instead of appending new command
unc0rr
parents:
11363
diff
changeset
|
90 |
begin |
dbc0d54798dc
Overwrite last '+' cmd in the queue instead of appending new command
unc0rr
parents:
11363
diff
changeset
|
91 |
headcmd:= command; |
dbc0d54798dc
Overwrite last '+' cmd in the queue instead of appending new command
unc0rr
parents:
11363
diff
changeset
|
92 |
lastcmd:= command |
dbc0d54798dc
Overwrite last '+' cmd in the queue instead of appending new command
unc0rr
parents:
11363
diff
changeset
|
93 |
end |
dbc0d54798dc
Overwrite last '+' cmd in the queue instead of appending new command
unc0rr
parents:
11363
diff
changeset
|
94 |
else |
dbc0d54798dc
Overwrite last '+' cmd in the queue instead of appending new command
unc0rr
parents:
11363
diff
changeset
|
95 |
begin |
dbc0d54798dc
Overwrite last '+' cmd in the queue instead of appending new command
unc0rr
parents:
11363
diff
changeset
|
96 |
lastcmd^.Next:= command; |
dbc0d54798dc
Overwrite last '+' cmd in the queue instead of appending new command
unc0rr
parents:
11363
diff
changeset
|
97 |
lastcmd:= command |
dbc0d54798dc
Overwrite last '+' cmd in the queue instead of appending new command
unc0rr
parents:
11363
diff
changeset
|
98 |
end; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
99 |
end; |
11483
dbc0d54798dc
Overwrite last '+' cmd in the queue instead of appending new command
unc0rr
parents:
11363
diff
changeset
|
100 |
|
dbc0d54798dc
Overwrite last '+' cmd in the queue instead of appending new command
unc0rr
parents:
11363
diff
changeset
|
101 |
FillChar(command^, sizeof(TCmd), 0); |
dbc0d54798dc
Overwrite last '+' cmd in the queue instead of appending new command
unc0rr
parents:
11363
diff
changeset
|
102 |
command^.loTime:= Time; |
dbc0d54798dc
Overwrite last '+' cmd in the queue instead of appending new command
unc0rr
parents:
11363
diff
changeset
|
103 |
command^.str:= str; |
dbc0d54798dc
Overwrite last '+' cmd in the queue instead of appending new command
unc0rr
parents:
11363
diff
changeset
|
104 |
if (command^.cmd <> 'F') and (command^.cmd <> 'G') then dec(command^.len, 2); // cut timestamp |
dbc0d54798dc
Overwrite last '+' cmd in the queue instead of appending new command
unc0rr
parents:
11363
diff
changeset
|
105 |
|
dbc0d54798dc
Overwrite last '+' cmd in the queue instead of appending new command
unc0rr
parents:
11363
diff
changeset
|
106 |
AddCmd:= command; |
648
fc5234aa6493
Use list instead of array (no limit for network packets amount)
unc0rr
parents:
526
diff
changeset
|
107 |
end; |
fc5234aa6493
Use list instead of array (no limit for network packets amount)
unc0rr
parents:
526
diff
changeset
|
108 |
|
fc5234aa6493
Use list instead of array (no limit for network packets amount)
unc0rr
parents:
526
diff
changeset
|
109 |
procedure RemoveCmd; |
fc5234aa6493
Use list instead of array (no limit for network packets amount)
unc0rr
parents:
526
diff
changeset
|
110 |
var tmp: PCmd; |
fc5234aa6493
Use list instead of array (no limit for network packets amount)
unc0rr
parents:
526
diff
changeset
|
111 |
begin |
fc5234aa6493
Use list instead of array (no limit for network packets amount)
unc0rr
parents:
526
diff
changeset
|
112 |
tmp:= headcmd; |
fc5234aa6493
Use list instead of array (no limit for network packets amount)
unc0rr
parents:
526
diff
changeset
|
113 |
headcmd:= headcmd^.Next; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
114 |
if headcmd = nil then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
115 |
lastcmd:= nil; |
648
fc5234aa6493
Use list instead of array (no limit for network packets amount)
unc0rr
parents:
526
diff
changeset
|
116 |
dispose(tmp) |
fc5234aa6493
Use list instead of array (no limit for network packets amount)
unc0rr
parents:
526
diff
changeset
|
117 |
end; |
4 | 118 |
|
119 |
procedure InitIPC; |
|
120 |
var ipaddr: TIPAddress; |
|
121 |
begin |
|
4815 | 122 |
WriteToConsole('Init SDL_Net... '); |
11507 | 123 |
SDLCheck(SDLNet_Init = 0, 'SDLNet_Init', true); |
4815 | 124 |
fds:= SDLNet_AllocSocketSet(1); |
11507 | 125 |
SDLCheck(fds <> nil, 'SDLNet_AllocSocketSet', true); |
4815 | 126 |
WriteLnToConsole(msgOK); |
4825 | 127 |
WriteToConsole('Establishing IPC connection to tcp 127.0.0.1:' + IntToStr(ipcPort) + ' '); |
4815 | 128 |
{$HINTS OFF} |
11507 | 129 |
SDLCheck(SDLNet_ResolveHost(ipaddr, PChar('127.0.0.1'), ipcPort) = 0, 'SDLNet_ResolveHost', true); |
4815 | 130 |
{$HINTS ON} |
131 |
IPCSock:= SDLNet_TCP_Open(ipaddr); |
|
11507 | 132 |
SDLCheck(IPCSock <> nil, 'SDLNet_TCP_Open', true); |
4815 | 133 |
WriteLnToConsole(msgOK) |
4 | 134 |
end; |
135 |
||
10392 | 136 |
procedure ParseChatCommand(command: shortstring; message: shortstring; |
137 |
messageStartIndex: Byte); |
|
138 |
var |
|
139 |
text: shortstring; |
|
140 |
begin |
|
141 |
text:= copy(message, messageStartIndex, |
|
142 |
Length(message) - messageStartIndex + 1); |
|
143 |
ParseCommand(command + text, true); |
|
144 |
WriteLnToConsole(text) |
|
145 |
end; |
|
146 |
||
4 | 147 |
procedure ParseIPCCommand(s: shortstring); |
649
26166c87dc75
- Use 2 bytes for timestamp in net protocol, thus decreasing average packet size from 6 to 4
unc0rr
parents:
648
diff
changeset
|
148 |
var loTicks: Word; |
10392 | 149 |
isProcessed: boolean; |
13851
76a1d6275cd3
Teach engine to properly display clan message received from the net
Wuzzy <Wuzzy2@mail.ru>
parents:
13797
diff
changeset
|
150 |
nick, msg: shortstring; |
76a1d6275cd3
Teach engine to properly display clan message received from the net
Wuzzy <Wuzzy2@mail.ru>
parents:
13797
diff
changeset
|
151 |
i: LongInt; |
4 | 152 |
begin |
10392 | 153 |
isProcessed := true; |
8026
4a4f21070479
merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents:
8003
diff
changeset
|
154 |
|
4 | 155 |
case s[1] of |
4900 | 156 |
'!': begin AddFileLog('Ping? Pong!'); isPonged:= true; end; |
7068 | 157 |
'?': SendIPC(_S'!'); |
351 | 158 |
'e': ParseCommand(copy(s, 2, Length(s) - 1), true); |
4 | 159 |
'E': OutError(copy(s, 2, Length(s) - 1), true); |
160 |
'W': OutError(copy(s, 2, Length(s) - 1), false); |
|
4389 | 161 |
'M': ParseCommand('landcheck ' + s, true); |
8243 | 162 |
'o': if fastUntilLag then ParseCommand('forcequit', true); |
4 | 163 |
'T': case s[2] of |
164 |
'L': GameType:= gmtLocal; |
|
165 |
'D': GameType:= gmtDemo; |
|
166 |
'N': GameType:= gmtNet; |
|
72 | 167 |
'S': GameType:= gmtSave; |
7180 | 168 |
'V': GameType:= gmtRecord; |
4 | 169 |
else OutError(errmsgIncorrectUse + ' IPC "T" :' + s[2], true) end; |
7201
dc17ffdf0702
The first campaign commit with a lot of changes...
belphegorr <szabibibi@gmail.com>
parents:
7103
diff
changeset
|
170 |
'V': begin |
dc17ffdf0702
The first campaign commit with a lot of changes...
belphegorr <szabibibi@gmail.com>
parents:
7103
diff
changeset
|
171 |
if s[2] = '.' then |
dc17ffdf0702
The first campaign commit with a lot of changes...
belphegorr <szabibibi@gmail.com>
parents:
7103
diff
changeset
|
172 |
ParseCommand('campvar ' + copy(s, 3, length(s) - 2), true); |
10392 | 173 |
end; |
14484
bd1db668b7c0
Add Lua functions to save/get mission variables
Wuzzy <Wuzzy2@mail.ru>
parents:
13898
diff
changeset
|
174 |
'v': begin |
bd1db668b7c0
Add Lua functions to save/get mission variables
Wuzzy <Wuzzy2@mail.ru>
parents:
13898
diff
changeset
|
175 |
if s[2] = '.' then |
bd1db668b7c0
Add Lua functions to save/get mission variables
Wuzzy <Wuzzy2@mail.ru>
parents:
13898
diff
changeset
|
176 |
ParseCommand('missvar ' + copy(s, 3, length(s) - 2), true); |
bd1db668b7c0
Add Lua functions to save/get mission variables
Wuzzy <Wuzzy2@mail.ru>
parents:
13898
diff
changeset
|
177 |
end; |
10392 | 178 |
'I': ParseCommand('pause server', true); |
179 |
's': if gameType = gmtNet then |
|
180 |
ParseChatCommand('chatmsg ', s, 2) |
|
10510 | 181 |
else |
10392 | 182 |
isProcessed:= false; |
183 |
'b': if gameType = gmtNet then |
|
13851
76a1d6275cd3
Teach engine to properly display clan message received from the net
Wuzzy <Wuzzy2@mail.ru>
parents:
13797
diff
changeset
|
184 |
// parse team message from net |
76a1d6275cd3
Teach engine to properly display clan message received from the net
Wuzzy <Wuzzy2@mail.ru>
parents:
13797
diff
changeset
|
185 |
// expected format: <PLAYER NAME>]<MESSAGE> |
76a1d6275cd3
Teach engine to properly display clan message received from the net
Wuzzy <Wuzzy2@mail.ru>
parents:
13797
diff
changeset
|
186 |
begin |
76a1d6275cd3
Teach engine to properly display clan message received from the net
Wuzzy <Wuzzy2@mail.ru>
parents:
13797
diff
changeset
|
187 |
i:= 2; |
76a1d6275cd3
Teach engine to properly display clan message received from the net
Wuzzy <Wuzzy2@mail.ru>
parents:
13797
diff
changeset
|
188 |
nick:= ''; |
76a1d6275cd3
Teach engine to properly display clan message received from the net
Wuzzy <Wuzzy2@mail.ru>
parents:
13797
diff
changeset
|
189 |
while (i <= length(s)) and (s[i] <> ']') do |
76a1d6275cd3
Teach engine to properly display clan message received from the net
Wuzzy <Wuzzy2@mail.ru>
parents:
13797
diff
changeset
|
190 |
begin |
76a1d6275cd3
Teach engine to properly display clan message received from the net
Wuzzy <Wuzzy2@mail.ru>
parents:
13797
diff
changeset
|
191 |
nick:= nick + s[i]; |
76a1d6275cd3
Teach engine to properly display clan message received from the net
Wuzzy <Wuzzy2@mail.ru>
parents:
13797
diff
changeset
|
192 |
inc(i) |
76a1d6275cd3
Teach engine to properly display clan message received from the net
Wuzzy <Wuzzy2@mail.ru>
parents:
13797
diff
changeset
|
193 |
end; |
76a1d6275cd3
Teach engine to properly display clan message received from the net
Wuzzy <Wuzzy2@mail.ru>
parents:
13797
diff
changeset
|
194 |
|
76a1d6275cd3
Teach engine to properly display clan message received from the net
Wuzzy <Wuzzy2@mail.ru>
parents:
13797
diff
changeset
|
195 |
inc(i); |
76a1d6275cd3
Teach engine to properly display clan message received from the net
Wuzzy <Wuzzy2@mail.ru>
parents:
13797
diff
changeset
|
196 |
msg:= ''; |
76a1d6275cd3
Teach engine to properly display clan message received from the net
Wuzzy <Wuzzy2@mail.ru>
parents:
13797
diff
changeset
|
197 |
while (i <= length(s)) do |
76a1d6275cd3
Teach engine to properly display clan message received from the net
Wuzzy <Wuzzy2@mail.ru>
parents:
13797
diff
changeset
|
198 |
begin |
76a1d6275cd3
Teach engine to properly display clan message received from the net
Wuzzy <Wuzzy2@mail.ru>
parents:
13797
diff
changeset
|
199 |
msg:= msg + s[i]; |
76a1d6275cd3
Teach engine to properly display clan message received from the net
Wuzzy <Wuzzy2@mail.ru>
parents:
13797
diff
changeset
|
200 |
inc(i) |
76a1d6275cd3
Teach engine to properly display clan message received from the net
Wuzzy <Wuzzy2@mail.ru>
parents:
13797
diff
changeset
|
201 |
end; |
13898 | 202 |
s:= 'b' + Format(shortstring(trmsg[sidChatTeam]), nick, msg); |
13851
76a1d6275cd3
Teach engine to properly display clan message received from the net
Wuzzy <Wuzzy2@mail.ru>
parents:
13797
diff
changeset
|
203 |
if (nick = '') or (msg = '') then |
76a1d6275cd3
Teach engine to properly display clan message received from the net
Wuzzy <Wuzzy2@mail.ru>
parents:
13797
diff
changeset
|
204 |
isProcessed:= false |
76a1d6275cd3
Teach engine to properly display clan message received from the net
Wuzzy <Wuzzy2@mail.ru>
parents:
13797
diff
changeset
|
205 |
else |
76a1d6275cd3
Teach engine to properly display clan message received from the net
Wuzzy <Wuzzy2@mail.ru>
parents:
13797
diff
changeset
|
206 |
ParseChatCommand('chatmsg ' + #4, s, 2); |
76a1d6275cd3
Teach engine to properly display clan message received from the net
Wuzzy <Wuzzy2@mail.ru>
parents:
13797
diff
changeset
|
207 |
end |
10510 | 208 |
else |
10392 | 209 |
isProcessed:= false; |
4 | 210 |
else |
10392 | 211 |
isProcessed:= false; |
212 |
end; |
|
213 |
||
214 |
if (not isProcessed) then |
|
215 |
begin |
|
216 |
loTicks:= SDLNet_Read16(@s[byte(s[0]) - 1]); |
|
217 |
AddCmd(loTicks, s); |
|
218 |
AddFileLog('[IPC in] ' + sanitizeCharForLog(s[1]) + ' ticks ' + IntToStr(lastcmd^.loTime)); |
|
219 |
end |
|
4 | 220 |
end; |
221 |
||
222 |
procedure IPCCheckSock; |
|
371 | 223 |
var i: LongInt; |
6453
11c578d30bd3
Countless imporvements to the parser and countless help to the parser in sources.
unc0rr
parents:
6247
diff
changeset
|
224 |
s: shortstring; |
4 | 225 |
begin |
6982 | 226 |
if IPCSock = nil then |
227 |
exit; |
|
1888
e76274ce7365
Add an ability to run engine without IPC connection.
unc0rr
parents:
1821
diff
changeset
|
228 |
|
6982 | 229 |
fds^.numsockets:= 0; |
230 |
SDLNet_AddSocket(fds, IPCSock); |
|
4 | 231 |
|
6982 | 232 |
while SDLNet_CheckSockets(fds, 0) > 0 do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
233 |
begin |
6982 | 234 |
i:= SDLNet_TCP_Recv(IPCSock, @s[1], 255 - Length(SocketString)); |
235 |
if i > 0 then |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
236 |
begin |
6982 | 237 |
s[0]:= char(i); |
238 |
SocketString:= SocketString + s; |
|
239 |
while (Length(SocketString) > 1) and (Length(SocketString) > byte(SocketString[1])) do |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
240 |
begin |
6982 | 241 |
ParseIPCCommand(copy(SocketString, 2, byte(SocketString[1]))); |
242 |
Delete(SocketString, 1, Succ(byte(SocketString[1]))) |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
243 |
end |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
244 |
end |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
245 |
else |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
246 |
OutError('IPC connection lost', true) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
247 |
end; |
1888
e76274ce7365
Add an ability to run engine without IPC connection.
unc0rr
parents:
1821
diff
changeset
|
248 |
end; |
e76274ce7365
Add an ability to run engine without IPC connection.
unc0rr
parents:
1821
diff
changeset
|
249 |
|
e76274ce7365
Add an ability to run engine without IPC connection.
unc0rr
parents:
1821
diff
changeset
|
250 |
procedure LoadRecordFromFile(fileName: shortstring); |
8026
4a4f21070479
merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents:
8003
diff
changeset
|
251 |
var f : File; |
4a4f21070479
merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents:
8003
diff
changeset
|
252 |
ss : shortstring = ''; |
4a4f21070479
merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents:
8003
diff
changeset
|
253 |
i : LongInt; |
4a4f21070479
merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents:
8003
diff
changeset
|
254 |
s : shortstring; |
1888
e76274ce7365
Add an ability to run engine without IPC connection.
unc0rr
parents:
1821
diff
changeset
|
255 |
begin |
2630 | 256 |
|
257 |
// set RDNLY on file open |
|
258 |
filemode:= 0; |
|
5130
3602ede67ec5
Add a parameter for game simulation with no gui/sound enabled, just to get statistics
unc0rr
parents:
4976
diff
changeset
|
259 |
{$I-} |
1888
e76274ce7365
Add an ability to run engine without IPC connection.
unc0rr
parents:
1821
diff
changeset
|
260 |
assign(f, fileName); |
e76274ce7365
Add an ability to run engine without IPC connection.
unc0rr
parents:
1821
diff
changeset
|
261 |
reset(f, 1); |
11532 | 262 |
if checkFails(IOResult = 0, 'Error opening file ' + fileName, true) then |
263 |
exit; |
|
5130
3602ede67ec5
Add a parameter for game simulation with no gui/sound enabled, just to get statistics
unc0rr
parents:
4976
diff
changeset
|
264 |
|
3407 | 265 |
i:= 0; // avoid compiler hints |
6453
11c578d30bd3
Countless imporvements to the parser and countless help to the parser in sources.
unc0rr
parents:
6247
diff
changeset
|
266 |
s[0]:= #0; |
1888
e76274ce7365
Add an ability to run engine without IPC connection.
unc0rr
parents:
1821
diff
changeset
|
267 |
repeat |
6453
11c578d30bd3
Countless imporvements to the parser and countless help to the parser in sources.
unc0rr
parents:
6247
diff
changeset
|
268 |
BlockRead(f, s[1], 255 - Length(ss), i); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
269 |
if i > 0 then |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
270 |
begin |
6453
11c578d30bd3
Countless imporvements to the parser and countless help to the parser in sources.
unc0rr
parents:
6247
diff
changeset
|
271 |
s[0]:= char(i); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
272 |
ss:= ss + s; |
11539 | 273 |
while (Length(ss) > 1)and(Length(ss) > byte(ss[1])) and allOK do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
274 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
275 |
ParseIPCCommand(copy(ss, 2, byte(ss[1]))); |
10015 | 276 |
Delete(ss, 1, Succ(byte(ss[1]))); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
277 |
end |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
278 |
end |
11539 | 279 |
until (i = 0) or (not allOK); |
1888
e76274ce7365
Add an ability to run engine without IPC connection.
unc0rr
parents:
1821
diff
changeset
|
280 |
|
e76274ce7365
Add an ability to run engine without IPC connection.
unc0rr
parents:
1821
diff
changeset
|
281 |
close(f) |
5130
3602ede67ec5
Add a parameter for game simulation with no gui/sound enabled, just to get statistics
unc0rr
parents:
4976
diff
changeset
|
282 |
{$I+} |
4 | 283 |
end; |
284 |
||
4376 | 285 |
procedure SendStat(sit: TStatInfoType; s: shortstring); |
13797
c084bd440009
Add funny message in stats screen when everyone wins
Wuzzy <Wuzzy2@mail.ru>
parents:
13759
diff
changeset
|
286 |
const stc: array [TStatInfoType] of char = ('r', 'D', 'k', 'K', 'H', 'T', 'P', 's', 'S', 'B', 'c', 'g', 'p', 'R', 'h'); |
4376 | 287 |
var buf: shortstring; |
288 |
begin |
|
289 |
buf:= 'i' + stc[sit] + s; |
|
290 |
SendIPCRaw(@buf[0], length(buf) + 1) |
|
291 |
end; |
|
292 |
||
8472
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
293 |
function isSyncedCommand(c: char): boolean; |
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
294 |
begin |
8841 | 295 |
case c of |
10343
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10307
diff
changeset
|
296 |
'+', '#', 'L', 'l', 'R', 'r', 'U' |
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10307
diff
changeset
|
297 |
, 'u', 'D', 'd', 'Z', 'z', 'A', 'a' |
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10307
diff
changeset
|
298 |
, 'S', 'j', 'J', ',', 'c', 'N', 'p' |
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10307
diff
changeset
|
299 |
, 'P', 'w', 't', '1', '2', '3', '4' |
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10307
diff
changeset
|
300 |
, '5', 'f', 'g': isSyncedCommand:= true; |
8841 | 301 |
else |
10142 | 302 |
isSyncedCommand:= ((byte(c) >= 128) and (byte(c) <= 128 + cMaxSlotIndex)) |
8841 | 303 |
end |
8472
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
304 |
end; |
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
305 |
|
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
306 |
procedure flushBuffer(); |
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
307 |
begin |
8645 | 308 |
if IPCSock <> nil then |
309 |
begin |
|
310 |
SDLNet_TCP_Send(IPCSock, @sendBuffer.buf, sendBuffer.count); |
|
311 |
flushDelayTicks:= 0; |
|
312 |
sendBuffer.count:= 0 |
|
313 |
end |
|
8472
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
314 |
end; |
4377 | 315 |
|
4 | 316 |
procedure SendIPC(s: shortstring); |
317 |
begin |
|
49 | 318 |
if IPCSock <> nil then |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
319 |
begin |
8472
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
320 |
if s[0] > #251 then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
321 |
s[0]:= #251; |
8330 | 322 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
323 |
SDLNet_Write16(GameTicks, @s[Succ(byte(s[0]))]); |
10015 | 324 |
|
8498
eecadca7db50
Bring back full log strings for commands, just a bit sanitized
unc0rr
parents:
8472
diff
changeset
|
325 |
AddFileLog('[IPC out] '+ sanitizeCharForLog(s[1])); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
326 |
inc(s[0], 2); |
10015 | 327 |
|
8472
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
328 |
if isSyncedCommand(s[1]) then |
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
329 |
begin |
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
330 |
if sendBuffer.count + byte(s[0]) >= cSendBufferSize then |
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
331 |
flushBuffer(); |
10015 | 332 |
|
8472
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
333 |
Move(s, sendBuffer.buf[sendBuffer.count], byte(s[0]) + 1); |
8543 | 334 |
inc(sendBuffer.count, byte(s[0]) + 1); |
10015 | 335 |
|
8545
1385ab7219d9
Oh, and # too to prevent occasional game hang when N is followed by #
unc0rr
parents:
8543
diff
changeset
|
336 |
if (s[1] = 'N') or (s[1] = '#') then |
8543 | 337 |
flushBuffer(); |
8472
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
338 |
end else |
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
339 |
SDLNet_TCP_Send(IPCSock, @s, Succ(byte(s[0]))) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
340 |
end |
4 | 341 |
end; |
342 |
||
155
401f4ea24715
Engine can generate land preview and send it via IPC
unc0rr
parents:
154
diff
changeset
|
343 |
procedure SendIPCRaw(p: pointer; len: Longword); |
401f4ea24715
Engine can generate land preview and send it via IPC
unc0rr
parents:
154
diff
changeset
|
344 |
begin |
208 | 345 |
if IPCSock <> nil then |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
346 |
begin |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
347 |
SDLNet_TCP_Send(IPCSock, p, len) |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
348 |
end |
155
401f4ea24715
Engine can generate land preview and send it via IPC
unc0rr
parents:
154
diff
changeset
|
349 |
end; |
401f4ea24715
Engine can generate land preview and send it via IPC
unc0rr
parents:
154
diff
changeset
|
350 |
|
8003 | 351 |
procedure SendIPCXY(cmd: char; X, Y: LongInt); |
154
5667e6f38704
Network protocol uses integers in network byte order
unc0rr
parents:
112
diff
changeset
|
352 |
var s: shortstring; |
5667e6f38704
Network protocol uses integers in network byte order
unc0rr
parents:
112
diff
changeset
|
353 |
begin |
8024 | 354 |
s[0]:= #9; |
154
5667e6f38704
Network protocol uses integers in network byte order
unc0rr
parents:
112
diff
changeset
|
355 |
s[1]:= cmd; |
8003 | 356 |
SDLNet_Write32(X, @s[2]); |
8024 | 357 |
SDLNet_Write32(Y, @s[6]); |
154
5667e6f38704
Network protocol uses integers in network byte order
unc0rr
parents:
112
diff
changeset
|
358 |
SendIPC(s) |
5667e6f38704
Network protocol uses integers in network byte order
unc0rr
parents:
112
diff
changeset
|
359 |
end; |
5667e6f38704
Network protocol uses integers in network byte order
unc0rr
parents:
112
diff
changeset
|
360 |
|
159 | 361 |
procedure IPCWaitPongEvent; |
4 | 362 |
begin |
363 |
isPonged:= false; |
|
364 |
repeat |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
365 |
IPCCheckSock; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
366 |
SDL_Delay(1) |
11539 | 367 |
until isPonged or (not allOK) |
4 | 368 |
end; |
369 |
||
159 | 370 |
procedure SendIPCAndWaitReply(s: shortstring); |
371 |
begin |
|
372 |
SendIPC(s); |
|
7068 | 373 |
SendIPC(_S'?'); |
159 | 374 |
IPCWaitPongEvent |
375 |
end; |
|
376 |
||
8472
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
377 |
procedure FlushMessages(Lag: Longword); |
2382 | 378 |
begin |
8472
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
379 |
inc(flushDelayTicks, Lag); |
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
380 |
if (flushDelayTicks >= cSendEmptyPacketTime) then |
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
381 |
begin |
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
382 |
if sendBuffer.count = 0 then |
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
383 |
SendIPC(_S'+'); |
10015 | 384 |
|
385 |
flushBuffer() |
|
8472
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
386 |
end |
2382 | 387 |
end; |
388 |
||
4 | 389 |
procedure NetGetNextCmd; |
390 |
var tmpflag: boolean; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
391 |
s: shortstring; |
8003 | 392 |
x32, y32: LongInt; |
4 | 393 |
begin |
977
fdbf2a5c1ad7
Fix an oops with chat string appearing between two net commands (it's very rare and random condition, but I caught it while playing via net)
unc0rr
parents:
946
diff
changeset
|
394 |
tmpflag:= true; |
fdbf2a5c1ad7
Fix an oops with chat string appearing between two net commands (it's very rare and random condition, but I caught it while playing via net)
unc0rr
parents:
946
diff
changeset
|
395 |
|
1351
aa7aefec5c1b
Add partial implementation of handling disconnects while playing via network
unc0rr
parents:
1066
diff
changeset
|
396 |
while (headcmd <> nil) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
397 |
and (tmpflag or (headcmd^.cmd = '#')) // '#' is the only cmd which can be sent within same tick after 'N' |
10560 | 398 |
and ((GameTicks = LongWord(hiTicks shl 16 + headcmd^.loTime)) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
399 |
or (headcmd^.cmd = 's') // for these commands time is not specified |
4467 | 400 |
or (headcmd^.cmd = 'h') // seems the hedgewars protocol does not allow remote synced commands |
5810 | 401 |
or (headcmd^.cmd = '#') // must be synced for saves to work |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
402 |
or (headcmd^.cmd = 'b') |
10343
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10307
diff
changeset
|
403 |
or (headcmd^.cmd = 'F') |
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10307
diff
changeset
|
404 |
or (headcmd^.cmd = 'G')) do |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
405 |
begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
406 |
case headcmd^.cmd of |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
407 |
'+': ; // do nothing - it is just an empty packet |
5810 | 408 |
'#': begin |
409 |
AddFileLog('hiTicks increment by remote message'); |
|
410 |
inc(hiTicks); |
|
411 |
end; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
412 |
'L': ParseCommand('+left', true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
413 |
'l': ParseCommand('-left', true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
414 |
'R': ParseCommand('+right', true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
415 |
'r': ParseCommand('-right', true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
416 |
'U': ParseCommand('+up', true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
417 |
'u': ParseCommand('-up', true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
418 |
'D': ParseCommand('+down', true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
419 |
'd': ParseCommand('-down', true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
420 |
'Z': ParseCommand('+precise', true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
421 |
'z': ParseCommand('-precise', true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
422 |
'A': ParseCommand('+attack', true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
423 |
'a': ParseCommand('-attack', true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
424 |
'S': ParseCommand('switch', true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
425 |
'j': ParseCommand('ljump', true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
426 |
'J': ParseCommand('hjump', true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
427 |
',': ParseCommand('skip', true); |
4531
4ea193b0e378
Reenable ReadyTimer using a synced message NEEDS TESTING.
nemo
parents:
4522
diff
changeset
|
428 |
'c': begin |
4ea193b0e378
Reenable ReadyTimer using a synced message NEEDS TESTING.
nemo
parents:
4522
diff
changeset
|
429 |
s:= copy(headcmd^.str, 2, Pred(headcmd^.len)); |
4ea193b0e378
Reenable ReadyTimer using a synced message NEEDS TESTING.
nemo
parents:
4522
diff
changeset
|
430 |
ParseCommand('gencmd ' + s, true); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
431 |
end; |
10392 | 432 |
's': ParseChatCommand('chatmsg ', headcmd^.str, 2); |
433 |
'b': ParseChatCommand('chatmsg ' + #4, headcmd^.str, 2); |
|
10343
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10307
diff
changeset
|
434 |
'F': ParseCommand('teamgone u' + copy(headcmd^.str, 2, Pred(headcmd^.len)), true); |
fe9853dea6c4
Finish implementation of ability to take control over your team after being disconnected. Completely untested.
unc0rr
parents:
10307
diff
changeset
|
435 |
'G': ParseCommand('teamback u' + copy(headcmd^.str, 2, Pred(headcmd^.len)), true); |
10349
a51de45dcc42
Fix some issues with rejoining (rejoining client still desyncs though)
unc0rr
parents:
10343
diff
changeset
|
436 |
'f': ParseCommand('teamgone s' + copy(headcmd^.str, 2, Pred(headcmd^.len)), true); |
a51de45dcc42
Fix some issues with rejoining (rejoining client still desyncs though)
unc0rr
parents:
10343
diff
changeset
|
437 |
'g': ParseCommand('teamback s' + copy(headcmd^.str, 2, Pred(headcmd^.len)), true); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
438 |
'N': begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
439 |
tmpflag:= false; |
7103 | 440 |
lastTurnChecksum:= SDLNet_Read32(@headcmd^.str[2]); |
4900 | 441 |
AddFileLog('got cmd "N": time '+IntToStr(hiTicks shl 16 + headcmd^.loTime)) |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
442 |
end; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
443 |
'p': begin |
9972
feb4b031b52e
Remove X and Y from the structure since those are misaligned in c code and I failed to do anything about that and they were the last cause of desyncs and only used in 4 places and I'm too lazy
unc0rr
parents:
9521
diff
changeset
|
444 |
x32:= SDLNet_Read32(@(headcmd^.str[2])); |
9974 | 445 |
y32:= SDLNet_Read32(@(headcmd^.str[6])); |
8003 | 446 |
doPut(x32, y32, false) |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
447 |
end; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
448 |
'P': begin |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
449 |
// these are equations solved for CursorPoint |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
450 |
// SDLNet_Read16(@(headcmd^.X)) == CursorPoint.X - WorldDx; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
451 |
// SDLNet_Read16(@(headcmd^.Y)) == cScreenHeight - CursorPoint.Y - WorldDy; |
8373
209c9ba77a09
Prevent camera from moving with auto camera disabled when remote teams are targetting
nemo
parents:
8243
diff
changeset
|
452 |
if CurrentTeam^.ExtDriven then |
2969
79024988792e
This *should* solve issue w/ cursor moving around in ammo menu while not your turn NEEDS TESTING, changing uIO makes me nervous
nemo
parents:
2948
diff
changeset
|
453 |
begin |
9972
feb4b031b52e
Remove X and Y from the structure since those are misaligned in c code and I failed to do anything about that and they were the last cause of desyncs and only used in 4 places and I'm too lazy
unc0rr
parents:
9521
diff
changeset
|
454 |
TargetCursorPoint.X:= LongInt(SDLNet_Read32(@(headcmd^.str[2]))) + WorldDx; |
9974 | 455 |
TargetCursorPoint.Y:= cScreenHeight - LongInt(SDLNet_Read32(@(headcmd^.str[6]))) - WorldDy; |
8373
209c9ba77a09
Prevent camera from moving with auto camera disabled when remote teams are targetting
nemo
parents:
8243
diff
changeset
|
456 |
if not bShowAmmoMenu and autoCameraOn then |
209c9ba77a09
Prevent camera from moving with auto camera disabled when remote teams are targetting
nemo
parents:
8243
diff
changeset
|
457 |
CursorPoint:= TargetCursorPoint |
2969
79024988792e
This *should* solve issue w/ cursor moving around in ammo menu while not your turn NEEDS TESTING, changing uIO makes me nervous
nemo
parents:
2948
diff
changeset
|
458 |
end |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
459 |
end; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
460 |
'w': ParseCommand('setweap ' + headcmd^.str[2], true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
461 |
't': ParseCommand('taunt ' + headcmd^.str[2], true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
462 |
'h': ParseCommand('hogsay ' + copy(headcmd^.str, 2, Pred(headcmd^.len)), true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
463 |
'1'..'5': ParseCommand('timer ' + headcmd^.cmd, true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
464 |
else |
9972
feb4b031b52e
Remove X and Y from the structure since those are misaligned in c code and I failed to do anything about that and they were the last cause of desyncs and only used in 4 places and I'm too lazy
unc0rr
parents:
9521
diff
changeset
|
465 |
if (byte(headcmd^.cmd) >= 128) and (byte(headcmd^.cmd) <= 128 + cMaxSlotIndex) then |
6874 | 466 |
ParseCommand('slot ' + char(byte(headcmd^.cmd) - 79), true) |
467 |
else |
|
468 |
OutError('Unexpected protocol command: ' + headcmd^.cmd, True) |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
469 |
end; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
470 |
RemoveCmd |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
471 |
end; |
351 | 472 |
|
2574
2f3e5c57359c
Fix (quite rare) spectators queue error when joining game with teams left the game.
unc0rr
parents:
2407
diff
changeset
|
473 |
if (headcmd <> nil) and tmpflag and (not CurrentTeam^.hasGone) then |
11532 | 474 |
checkFails(GameTicks < LongWord(hiTicks shl 16) + headcmd^.loTime, |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
475 |
'oops, queue error. in buffer: ' + headcmd^.cmd + |
4374 | 476 |
' (' + IntToStr(GameTicks) + ' > ' + |
477 |
IntToStr(hiTicks shl 16 + headcmd^.loTime) + ')', |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
478 |
true); |
4 | 479 |
|
2066 | 480 |
isInLag:= (headcmd = nil) and tmpflag and (not CurrentTeam^.hasGone); |
2043
1f2b91b5e7ef
Don't accept 'team gone' command right after 'next turn' cmd
unc0rr
parents:
2017
diff
changeset
|
481 |
|
10862
4575977d3ce0
Don't spawn team widget sorter on each frame when in lag. Issue 'spectate 0' instead, and only on first lag occasion.
unc0rr
parents:
10851
diff
changeset
|
482 |
if isInLag and fastUntilLag then |
4575977d3ce0
Don't spawn team widget sorter on each frame when in lag. Issue 'spectate 0' instead, and only on first lag occasion.
unc0rr
parents:
10851
diff
changeset
|
483 |
begin |
4575977d3ce0
Don't spawn team widget sorter on each frame when in lag. Issue 'spectate 0' instead, and only on first lag occasion.
unc0rr
parents:
10851
diff
changeset
|
484 |
ParseCommand('spectate 0', true); |
4575977d3ce0
Don't spawn team widget sorter on each frame when in lag. Issue 'spectate 0' instead, and only on first lag occasion.
unc0rr
parents:
10851
diff
changeset
|
485 |
fastUntilLag:= false |
4575977d3ce0
Don't spawn team widget sorter on each frame when in lag. Issue 'spectate 0' instead, and only on first lag occasion.
unc0rr
parents:
10851
diff
changeset
|
486 |
end; |
4 | 487 |
end; |
488 |
||
4403 | 489 |
procedure chFatalError(var s: shortstring); |
490 |
begin |
|
491 |
SendIPC('E' + s); |
|
9301
c5d1c8259ef4
break uDebug and uCommand depedency loop by putting stuff in uIO
koda
parents:
9178
diff
changeset
|
492 |
// TODO: should we try to clean more stuff here? |
c5d1c8259ef4
break uDebug and uCommand depedency loop by putting stuff in uIO
koda
parents:
9178
diff
changeset
|
493 |
SDL_Quit; |
10307
e13d3147f15b
do not get stuck on "in game..." page just because of game crash. output a message instead. could still need some tweaking, but a man gotta sleep. and sheep too...
sheepluva
parents:
10306
diff
changeset
|
494 |
|
e13d3147f15b
do not get stuck on "in game..." page just because of game crash. output a message instead. could still need some tweaking, but a man gotta sleep. and sheep too...
sheepluva
parents:
10306
diff
changeset
|
495 |
if IPCSock <> nil then |
e13d3147f15b
do not get stuck on "in game..." page just because of game crash. output a message instead. could still need some tweaking, but a man gotta sleep. and sheep too...
sheepluva
parents:
10306
diff
changeset
|
496 |
halt(HaltFatalError) |
e13d3147f15b
do not get stuck on "in game..." page just because of game crash. output a message instead. could still need some tweaking, but a man gotta sleep. and sheep too...
sheepluva
parents:
10306
diff
changeset
|
497 |
else |
e13d3147f15b
do not get stuck on "in game..." page just because of game crash. output a message instead. could still need some tweaking, but a man gotta sleep. and sheep too...
sheepluva
parents:
10306
diff
changeset
|
498 |
halt(HaltFatalErrorNoIPC); |
4403 | 499 |
end; |
500 |
||
4414 | 501 |
procedure doPut(putX, putY: LongInt; fromAI: boolean); |
502 |
begin |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
503 |
if CheckNoTeamOrHH or isPaused then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
504 |
exit; |
4414 | 505 |
bShowFinger:= false; |
8026
4a4f21070479
merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents:
8003
diff
changeset
|
506 |
if (not CurrentTeam^.ExtDriven) and bShowAmmoMenu then |
4414 | 507 |
begin |
508 |
bSelected:= true; |
|
509 |
exit |
|
510 |
end; |
|
511 |
||
512 |
with CurrentHedgehog^.Gear^, |
|
513 |
CurrentHedgehog^ do |
|
10818
f642a28cab0c
Add placement of airmines in engine outside of hog proximity. Has a bug, only protecting 1st team. Also fix a spelling error and rename gstHHChooseTarget to gstChooseTarget
nemo
parents:
10663
diff
changeset
|
514 |
if (State and gstChooseTarget) <> 0 then |
15114
8cb1eebee4a0
Properly prevent using airstrike or girder in mid-air
Wuzzy <Wuzzy2@mail.ru>
parents:
14535
diff
changeset
|
515 |
if ((((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_AttackInMove) <> 0) or ((State and gstMoving) = 0)) or ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_AttackingPut) = 0)) then |
4414 | 516 |
begin |
12687
ebb32d3021a5
Fix cursor still being visible after using piano strike
Wuzzy <almikes@aol.com>
parents:
12650
diff
changeset
|
517 |
if (Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoTargetAfter) <> 0 then |
12650
eaf719616c7b
Fix cursor often jumping to center when putting target while moving cursor
Wuzzy <almikes@aol.com>
parents:
11539
diff
changeset
|
518 |
isCursorVisible:= false; |
4414 | 519 |
if not CurrentTeam^.ExtDriven then |
520 |
begin |
|
521 |
if fromAI then |
|
522 |
begin |
|
523 |
TargetPoint.X:= putX; |
|
524 |
TargetPoint.Y:= putY |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
525 |
end |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
526 |
else |
4414 | 527 |
begin |
528 |
TargetPoint.X:= CursorPoint.X - WorldDx; |
|
529 |
TargetPoint.Y:= cScreenHeight - CursorPoint.Y - WorldDy; |
|
530 |
end; |
|
14535
5ac181cb2396
Fix bee targeting fail across wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14484
diff
changeset
|
531 |
if (WorldEdge <> weBounce) and ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoWrapTarget) = 0) then |
12789
28782e03b8f0
Fix CheckWorldWrap not correctly checking for bounce edge. Also fix teleport @ bounce edge
Wuzzy <Wuzzy2@mail.ru>
parents:
12736
diff
changeset
|
532 |
TargetPoint.X:= CalcWorldWrap(TargetPoint.X, 0); |
4414 | 533 |
SendIPCXY('p', TargetPoint.X, TargetPoint.Y); |
534 |
end |
|
535 |
else |
|
536 |
begin |
|
14535
5ac181cb2396
Fix bee targeting fail across wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14484
diff
changeset
|
537 |
if (Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoWrapTarget) = 0 then |
5ac181cb2396
Fix bee targeting fail across wrap world edge
Wuzzy <Wuzzy2@mail.ru>
parents:
14484
diff
changeset
|
538 |
TargetPoint.X:= CalcWorldWrap(TargetPoint.X, 0); |
4414 | 539 |
TargetPoint.X:= putX; |
540 |
TargetPoint.Y:= putY |
|
541 |
end; |
|
4900 | 542 |
AddFileLog('put: ' + inttostr(TargetPoint.X) + ', ' + inttostr(TargetPoint.Y)); |
10818
f642a28cab0c
Add placement of airmines in engine outside of hog proximity. Has a bug, only protecting 1st team. Also fix a spelling error and rename gstHHChooseTarget to gstChooseTarget
nemo
parents:
10663
diff
changeset
|
543 |
State:= State and (not gstChooseTarget); |
4414 | 544 |
if (Ammoz[CurAmmoType].Ammo.Propz and ammoprop_AttackingPut) <> 0 then |
4522
0f590eefd531
Add an input mask for setting of gear messages. Intended for intercepting user messages. This is totally untested. I don't think it should desync but seriously needs a lot of testing. Esp the doPut behaviour.
nemo
parents:
4467
diff
changeset
|
545 |
Message:= Message or (gmAttack and InputMask); |
15156
7a8cc8bc963e
Clear jump and walk msgs after placement
Wuzzy <Wuzzy2@mail.ru>
parents:
15114
diff
changeset
|
546 |
Message:= Message and (not (gmHJump or gmLJump or gmLeft or gmRight or gmUp or gmDown)); |
4414 | 547 |
end |
15114
8cb1eebee4a0
Properly prevent using airstrike or girder in mid-air
Wuzzy <Wuzzy2@mail.ru>
parents:
14535
diff
changeset
|
548 |
else |
8cb1eebee4a0
Properly prevent using airstrike or girder in mid-air
Wuzzy <Wuzzy2@mail.ru>
parents:
14535
diff
changeset
|
549 |
PlaySound(sndDenied) |
4414 | 550 |
else |
551 |
if CurrentTeam^.ExtDriven then |
|
13506
bdac56fb6f1a
Clarify/rewrite a few OutError messages
Wuzzy <Wuzzy2@mail.ru>
parents:
12894
diff
changeset
|
552 |
OutError('Got /put while not being in choose target mode', false) |
4414 | 553 |
end; |
554 |
||
3038 | 555 |
procedure initModule; |
2699
249adefa9c1c
replace initialization/finalization statements with custom init functions
koda
parents:
2695
diff
changeset
|
556 |
begin |
6898 | 557 |
RegisterVariable('fatal', @chFatalError, true ); |
4403 | 558 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
559 |
IPCSock:= nil; |
11507 | 560 |
fds:= nil; |
2699
249adefa9c1c
replace initialization/finalization statements with custom init functions
koda
parents:
2695
diff
changeset
|
561 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
562 |
headcmd:= nil; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
563 |
lastcmd:= nil; |
6982 | 564 |
isPonged:= false; |
565 |
SocketString:= ''; |
|
8330 | 566 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2905
diff
changeset
|
567 |
hiTicks:= 0; |
8472
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
568 |
flushDelayTicks:= 0; |
da6b569ac930
- Collect synced packets to send within 1 second (cSendEmptyPacketTime) into buffer which is flushed each second.
unc0rr
parents:
8373
diff
changeset
|
569 |
sendBuffer.count:= 0; |
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2699
diff
changeset
|
570 |
end; |
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2699
diff
changeset
|
571 |
|
3038 | 572 |
procedure freeModule; |
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2699
diff
changeset
|
573 |
begin |
7026
8d1724e1337e
split OnDestroy across the appropriate modules (this doen't cause leaks on mobile, right?)
koda
parents:
6982
diff
changeset
|
574 |
while headcmd <> nil do RemoveCmd; |
8d1724e1337e
split OnDestroy across the appropriate modules (this doen't cause leaks on mobile, right?)
koda
parents:
6982
diff
changeset
|
575 |
SDLNet_FreeSocketSet(fds); |
8d1724e1337e
split OnDestroy across the appropriate modules (this doen't cause leaks on mobile, right?)
koda
parents:
6982
diff
changeset
|
576 |
SDLNet_TCP_Close(IPCSock); |
8d1724e1337e
split OnDestroy across the appropriate modules (this doen't cause leaks on mobile, right?)
koda
parents:
6982
diff
changeset
|
577 |
SDLNet_Quit(); |
8026
4a4f21070479
merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents:
8003
diff
changeset
|
578 |
|
2699
249adefa9c1c
replace initialization/finalization statements with custom init functions
koda
parents:
2695
diff
changeset
|
579 |
end; |
249adefa9c1c
replace initialization/finalization statements with custom init functions
koda
parents:
2695
diff
changeset
|
580 |
|
4 | 581 |
end. |