… | |
… | |
186 | |
186 | |
187 | /** |
187 | /** |
188 | * Dispatch table for the server. |
188 | * Dispatch table for the server. |
189 | */ |
189 | */ |
190 | static struct packet_type packets[] = { |
190 | static struct packet_type packets[] = { |
191 | {"ncom", PC(NewPlayerCmd) PF_PLAYING }, |
191 | {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 }, |
192 | {"command", PC(PlayerCmd) PF_PLAYING }, |
192 | {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND0 }, |
193 | |
193 | |
194 | {"examine", PC(ExamineCmd) PF_PLAYING }, |
194 | {"examine", PC(ExamineCmd) PF_PLAYING }, |
195 | {"apply", PC(ApplyCmd) PF_PLAYING }, |
195 | {"apply", PC(ApplyCmd) PF_PLAYING }, |
196 | {"lookat", PC(LookAt) PF_PLAYING }, |
196 | {"lookat", PC(LookAt) PF_PLAYING }, |
197 | {"lock", PC(LockItem) PF_PLAYING }, |
197 | {"lock", PC(LockItem) PF_PLAYING }, |
… | |
… | |
220 | { |
220 | { |
221 | return (!(pkt->flags & PF_PLAYER) || pl) |
221 | return (!(pkt->flags & PF_PLAYER) || pl) |
222 | && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING); |
222 | && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING); |
223 | } |
223 | } |
224 | |
224 | |
|
|
225 | // HACK: some commands currently should be executed |
|
|
226 | // even when the player is frozen. this hack detects |
|
|
227 | // those commands. it should be folded into may_execute, |
|
|
228 | // but kept seperate to emphasise the hack aspect, i.e. |
|
|
229 | // do it better, then remove. |
|
|
230 | static bool |
|
|
231 | always_immediate (const client *ns, const packet_type *pkt, const char *data, int len) |
|
|
232 | { |
|
|
233 | if (!(pkt->flags & (PF_COMMAND0 | PF_COMMAND6))) |
|
|
234 | return false; |
|
|
235 | |
|
|
236 | if (!ns->pl || !ns->pl->ob || !ns->pl->ob->map) |
|
|
237 | return false; |
|
|
238 | |
|
|
239 | if (pkt->flags & PF_COMMAND6) |
|
|
240 | { |
|
|
241 | data += 6; |
|
|
242 | len -= 6; |
|
|
243 | } |
|
|
244 | |
|
|
245 | if (len > 4 && !strncmp (data, "say " , 4)) |
|
|
246 | return true; |
|
|
247 | if (len > 5 && !strncmp (data, "chat ", 5)) |
|
|
248 | return true; |
|
|
249 | |
|
|
250 | return false; |
|
|
251 | } |
|
|
252 | |
225 | void |
253 | void |
226 | client::execute (const packet_type *pkt, char *data, int datalen) |
254 | client::execute (const packet_type *pkt, char *data, int datalen) |
227 | { |
255 | { |
228 | if (may_execute (pkt)) |
256 | if (may_execute (pkt) || always_immediate (this, pkt, data, datalen)) |
229 | { |
257 | { |
230 | //TODO: only one format |
258 | //TODO: only one format |
231 | if (pkt->flags & PF_PLAYER) |
259 | if (pkt->flags & PF_PLAYER) |
232 | ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl); |
260 | ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl); |
233 | else |
261 | else |
… | |
… | |
274 | } |
302 | } |
275 | |
303 | |
276 | for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt) |
304 | for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt) |
277 | if (!strcmp ((char *)inbuf + 2, pkt->name)) |
305 | if (!strcmp ((char *)inbuf + 2, pkt->name)) |
278 | { |
306 | { |
279 | if (pkt->flags & PF_PLAYER) |
307 | if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen)) |
280 | queue_command (pkt, data, datalen); |
308 | queue_command (pkt, data, datalen); |
281 | else |
309 | else |
282 | execute (pkt, data, datalen); |
310 | execute (pkt, data, datalen); |
283 | |
311 | |
284 | goto next_packet; |
312 | goto next_packet; |
… | |
… | |
381 | */ |
409 | */ |
382 | void |
410 | void |
383 | client::send (void *buf_, int len) |
411 | client::send (void *buf_, int len) |
384 | { |
412 | { |
385 | char *buf = (char *)buf_; |
413 | char *buf = (char *)buf_; |
386 | char *pos = buf; |
|
|
387 | int amt = 0; |
|
|
388 | |
414 | |
389 | if (destroyed () || !buf) |
415 | if (destroyed () || !buf) |
390 | return; |
416 | return; |
391 | |
417 | |
392 | if (len + outputbuffer.len > SOCKETBUFSIZE) |
418 | if (len + outputbuffer.len > SOCKETBUFSIZE) |
… | |
… | |
476 | va_end (ap); |
502 | va_end (ap); |
477 | |
503 | |
478 | send_packet (sl); |
504 | send_packet (sl); |
479 | } |
505 | } |
480 | |
506 | |
|
|
507 | void |
|
|
508 | client::send_drawinfo (const char *msg, int flags) |
|
|
509 | { |
|
|
510 | send_packet_printf ("drawinfo %d %s", flags, msg); |
|
|
511 | } |
|
|
512 | |
481 | /*********************************************************************** |
513 | /*********************************************************************** |
482 | * |
514 | * |
483 | * packet functions/utilities |
515 | * packet functions/utilities |
484 | * |
516 | * |
485 | **********************************************************************/ |
517 | **********************************************************************/ |