1 | /* |
1 | /* |
2 | * CrossFire, A Multiplayer game for X-windows |
2 | * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. |
3 | * |
3 | * |
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team |
5 | * Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
6 | * Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
7 | * |
7 | * |
8 | * This program is free software; you can redistribute it and/or modify |
8 | * Crossfire TRT is free software; you can redistribute it and/or modify it |
9 | * it under the terms of the GNU General Public License as published by |
9 | * under the terms of the GNU General Public License as published by the Free |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | * Software Foundation; either version 2 of the License, or (at your option) |
11 | * (at your option) any later version. |
11 | * any later version. |
12 | * |
12 | * |
13 | * This program is distributed in the hope that it will be useful, |
13 | * This program is distributed in the hope that it will be useful, but |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
16 | * GNU General Public License for more details. |
16 | * for more details. |
17 | * |
17 | * |
18 | * You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the GNU General Public License along |
19 | * along with this program; if not, write to the Free Software |
19 | * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
21 | * |
21 | * |
22 | * The author can be reached via e-mail to <crossfire@schmorp.de> |
22 | * The authors can be reached via e-mail to <crossfire@schmorp.de> |
23 | */ |
23 | */ |
24 | |
24 | |
25 | /** |
25 | /** |
26 | * \file |
26 | * \file |
27 | * Client/server logic. |
27 | * Client/server logic. |
… | |
… | |
264 | |
264 | |
265 | flags = query_flags (head); |
265 | flags = query_flags (head); |
266 | if (QUERY_FLAG (head, FLAG_NO_PICK)) |
266 | if (QUERY_FLAG (head, FLAG_NO_PICK)) |
267 | flags |= F_NOPICK; |
267 | flags |= F_NOPICK; |
268 | |
268 | |
269 | if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE)) |
269 | ns.send_face (head->face); |
270 | esrv_send_face (&ns, head->face->number, 0); |
270 | ns.flush_fx (); |
271 | |
271 | |
272 | if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) |
272 | if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) |
273 | esrv_send_animation (&ns, head->animation_id); |
273 | ns.send_animation (head->animation_id); |
274 | |
274 | |
275 | sl << uint32 (head->count) |
275 | sl << uint32 (head->count) |
276 | << uint32 (flags) |
276 | << uint32 (flags) |
277 | << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) |
277 | << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) |
278 | << uint32 (head->face->number); |
278 | << uint32 (head->face); |
279 | |
279 | |
280 | if (!head->custom_name) |
280 | if (!head->custom_name) |
281 | { |
281 | { |
282 | strncpy (item_n, query_base_name (head, 0), 127); |
282 | strncpy (item_n, query_base_name (head, 0), 127); |
283 | item_n[127] = 0; |
283 | item_n[127] = 0; |
… | |
… | |
304 | { |
304 | { |
305 | if (head->anim_speed) |
305 | if (head->anim_speed) |
306 | anim_speed = head->anim_speed; |
306 | anim_speed = head->anim_speed; |
307 | else |
307 | else |
308 | { |
308 | { |
309 | if (FABS (head->speed) < 0.001) |
309 | if (fabs (head->speed) < 0.001) |
310 | anim_speed = 255; |
310 | anim_speed = 255; |
311 | else if (FABS (head->speed) >= 1.0) |
311 | else if (fabs (head->speed) >= 1.0) |
312 | anim_speed = 1; |
312 | anim_speed = 1; |
313 | else |
313 | else |
314 | anim_speed = (int) (1.0 / FABS (head->speed)); |
314 | anim_speed = (int) (1.0 / fabs (head->speed)); |
315 | } |
315 | } |
316 | |
316 | |
317 | if (anim_speed > 255) |
317 | if (anim_speed > 255) |
318 | anim_speed = 255; |
318 | anim_speed = 255; |
319 | } |
319 | } |
… | |
… | |
331 | * Send the look window. Don't need to do animations here |
331 | * Send the look window. Don't need to do animations here |
332 | * This sends all the faces to the client, not just updates. This is |
332 | * This sends all the faces to the client, not just updates. This is |
333 | * because object ordering would otherwise be inconsistent. |
333 | * because object ordering would otherwise be inconsistent. |
334 | */ |
334 | */ |
335 | void |
335 | void |
336 | esrv_draw_look (object *pl) |
336 | esrv_draw_look (player *pl) |
337 | { |
337 | { |
338 | int got_one = 0, start_look = 0, end_look = 0; |
338 | int got_one = 0, start_look = 0, end_look = 0; |
339 | char buf[MAX_BUF]; |
|
|
340 | |
339 | |
|
|
340 | object *ob = pl->ob; |
|
|
341 | |
341 | if (!pl->contr->ns->update_look) |
342 | if (!pl->ns->update_look) |
342 | { |
343 | { |
343 | LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); |
344 | LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name); |
344 | return; |
345 | return; |
345 | } |
346 | } |
346 | else |
347 | else |
347 | pl->contr->ns->update_look = 0; |
348 | pl->ns->update_look = 0; |
348 | |
349 | |
349 | if (QUERY_FLAG (pl, FLAG_REMOVED) |
350 | if (QUERY_FLAG (ob, FLAG_REMOVED) |
350 | || !pl->map |
351 | || !ob->map |
351 | || pl->map->in_memory != MAP_IN_MEMORY |
352 | || ob->map->in_memory != MAP_IN_MEMORY |
352 | || out_of_map (pl->map, pl->x, pl->y)) |
353 | || out_of_map (ob->map, ob->x, ob->y)) |
353 | return; |
354 | return; |
354 | |
355 | |
355 | pl->contr->ns->send_packet ("delinv 0"); |
356 | pl->ns->send_packet ("delinv 0"); |
356 | |
357 | |
357 | packet sl; |
358 | packet sl; |
358 | sl.printf ("item%d ", pl->contr->ns->itemcmd); |
359 | sl.printf ("item%d ", pl->ns->itemcmd); |
359 | |
360 | |
360 | sl << uint32 (0); |
361 | sl << uint32 (0); |
361 | |
362 | |
362 | if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE)) |
363 | pl->ns->send_face (empty_face); |
363 | esrv_send_face (pl->contr->ns, empty_face->number, 0); |
364 | pl->ns->flush_fx (); |
364 | |
365 | |
365 | if (pl->contr->ns->look_position) |
366 | if (pl->ns->look_position) |
366 | { |
367 | { |
367 | char buf[80]; |
368 | char buf[80]; |
368 | snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); |
369 | snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); |
369 | |
370 | |
370 | sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) |
371 | sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE)) |
371 | << uint32 (0) |
372 | << uint32 (0) |
372 | << sint32 (-1) |
373 | << sint32 (-1) |
373 | << uint32 (empty_face->number) |
374 | << uint32 (empty_face) |
374 | << data8 (buf) |
375 | << data8 (buf) |
375 | << uint16 (0) |
376 | << uint16 (0) |
376 | << uint8 (0) |
377 | << uint8 (0) |
377 | << uint32 (0); |
378 | << uint32 (0); |
378 | |
379 | |
379 | if (pl->contr->ns->itemcmd == 2) |
380 | if (pl->ns->itemcmd == 2) |
380 | sl << uint16 (0); |
381 | sl << uint16 (0); |
381 | } |
382 | } |
382 | |
383 | |
383 | object *tmp = pl->ms ().top; |
384 | object *tmp = ob->ms ().top; |
384 | for (object *last = 0; tmp != last; tmp = tmp->below) |
385 | for (object *last = 0; tmp != last; tmp = tmp->below) |
385 | { |
386 | { |
386 | object *head; |
387 | object *head; |
387 | |
388 | |
388 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) |
389 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) |
… | |
… | |
392 | last = last->below; |
393 | last = last->below; |
393 | } |
394 | } |
394 | |
395 | |
395 | if (tmp->client_visible ()) |
396 | if (tmp->client_visible ()) |
396 | { |
397 | { |
397 | if (++start_look < pl->contr->ns->look_position) |
398 | if (++start_look < pl->ns->look_position) |
398 | continue; |
399 | continue; |
399 | |
400 | |
400 | end_look++; |
401 | end_look++; |
401 | |
402 | |
402 | if (end_look > FLOORBOX_PAGESIZE) |
403 | if (end_look > FLOORBOX_PAGESIZE) |
403 | { |
404 | { |
404 | /* What we basically do is make a 'fake' object - when the user applies it, |
405 | /* What we basically do is make a 'fake' object - when the user applies it, |
405 | * we notice the special tag the object has, and act accordingly. |
406 | * we notice the special tag the object has, and act accordingly. |
406 | */ |
407 | */ |
407 | sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE)) |
408 | sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE)) |
408 | << uint32 (0) |
409 | << uint32 (0) |
409 | << uint32 ((uint32) - 1) |
410 | << uint32 ((uint32) - 1) |
410 | << uint32 (empty_face->number) |
411 | << uint32 (empty_face) |
411 | << data8 ("Apply this to see next group of items") |
412 | << data8 ("Apply this to see next group of items") |
412 | << uint16 (0) |
413 | << uint16 (0) |
413 | << uint8 (0) |
414 | << uint8 (0) |
414 | << uint32 (0); |
415 | << uint32 (0); |
415 | |
416 | |
416 | if (pl->contr->ns->itemcmd == 2) |
417 | if (pl->ns->itemcmd == 2) |
417 | sl << uint16 (0); |
418 | sl << uint16 (0); |
418 | |
419 | |
419 | break; |
420 | break; |
420 | } |
421 | } |
421 | |
422 | |
422 | if (tmp->head) |
423 | if (tmp->head) |
423 | head = tmp->head; |
424 | head = tmp->head; |
424 | else |
425 | else |
425 | head = tmp; |
426 | head = tmp; |
426 | |
427 | |
427 | add_object_to_socklist (*pl->contr->ns, sl, head); |
428 | add_object_to_socklist (*pl->ns, sl, head); |
428 | got_one++; |
429 | got_one++; |
429 | |
430 | |
430 | if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) |
431 | if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) |
431 | { |
432 | { |
432 | pl->contr->ns->send_packet (sl); |
433 | pl->ns->send_packet (sl); |
433 | |
434 | |
434 | sl.reset (); |
435 | sl.reset (); |
435 | sl.printf ("item%d ", pl->contr->ns->itemcmd); |
436 | sl.printf ("item%d ", pl->ns->itemcmd); |
436 | sl << uint32 (0); |
437 | sl << uint32 (0); |
437 | got_one = 0; |
438 | got_one = 0; |
438 | } |
439 | } |
439 | } |
440 | } |
440 | } |
441 | } |
441 | |
442 | |
442 | if (got_one) |
443 | if (got_one) |
443 | pl->contr->ns->send_packet (sl); |
444 | pl->ns->send_packet (sl); |
444 | |
445 | |
445 | } |
446 | } |
446 | |
447 | |
447 | /** |
448 | /** |
448 | * Sends whole inventory. |
449 | * Sends whole inventory. |
… | |
… | |
502 | * |
503 | * |
503 | * flags is a list of values to update |
504 | * flags is a list of values to update |
504 | * to the client (as defined in newclient.h - might as well use the |
505 | * to the client (as defined in newclient.h - might as well use the |
505 | * same value both places. |
506 | * same value both places. |
506 | */ |
507 | */ |
507 | |
|
|
508 | void |
508 | void |
509 | esrv_update_item (int flags, object *pl, object *op) |
509 | esrv_update_item (int flags, object *pl, object *op) |
510 | { |
510 | { |
511 | /* If we have a request to send the player item, skip a few checks. */ |
511 | /* If we have a request to send the player item, skip a few checks. */ |
512 | if (op != pl) |
512 | if (op != pl) |
… | |
… | |
557 | ns->last_weight = weight; |
557 | ns->last_weight = weight; |
558 | } |
558 | } |
559 | |
559 | |
560 | if (flags & UPD_FACE) |
560 | if (flags & UPD_FACE) |
561 | { |
561 | { |
562 | if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) |
562 | ns->send_face (op->face); |
563 | esrv_send_face (ns, op->face->number, 0); |
563 | ns->flush_fx (); |
564 | |
|
|
565 | sl << uint32 (op->face->number); |
564 | sl << uint32 (op->face); |
566 | } |
565 | } |
567 | |
566 | |
568 | if (flags & UPD_NAME) |
567 | if (flags & UPD_NAME) |
569 | { |
568 | { |
570 | int len; |
569 | int len; |
… | |
… | |
604 | { |
603 | { |
605 | if (op->anim_speed) |
604 | if (op->anim_speed) |
606 | anim_speed = op->anim_speed; |
605 | anim_speed = op->anim_speed; |
607 | else |
606 | else |
608 | { |
607 | { |
609 | if (FABS (op->speed) < 0.001) |
608 | if (fabs (op->speed) < 0.001) |
610 | anim_speed = 255; |
609 | anim_speed = 255; |
611 | else if (FABS (op->speed) >= 1.0) |
610 | else if (fabs (op->speed) >= 1.0) |
612 | anim_speed = 1; |
611 | anim_speed = 1; |
613 | else |
612 | else |
614 | anim_speed = (int) (1.0 / FABS (op->speed)); |
613 | anim_speed = (int) (1.0 / fabs (op->speed)); |
615 | } |
614 | } |
616 | |
615 | |
617 | if (anim_speed > 255) |
616 | if (anim_speed > 255) |
618 | anim_speed = 255; |
617 | anim_speed = 255; |
619 | } |
618 | } |
… | |
… | |
631 | * Sends item's info to player. |
630 | * Sends item's info to player. |
632 | */ |
631 | */ |
633 | void |
632 | void |
634 | esrv_send_item (object *pl, object *op) |
633 | esrv_send_item (object *pl, object *op) |
635 | { |
634 | { |
|
|
635 | if (!pl->contr->ns) |
|
|
636 | return; |
|
|
637 | |
636 | /* If this is not the player object, do some more checks */ |
638 | /* If this is not the player object, do some more checks */ |
637 | if (op != pl) |
639 | if (op != pl) |
638 | { |
640 | { |
639 | /* We only send 'visibile' objects to the client */ |
641 | /* We only send 'visibile' objects to the client */ |
640 | if (!op->client_visible ()) |
642 | if (!op->client_visible ()) |
… | |
… | |
667 | |
669 | |
668 | /** |
670 | /** |
669 | * Tells the client to delete an item. Uses the item |
671 | * Tells the client to delete an item. Uses the item |
670 | * command with a -1 location. |
672 | * command with a -1 location. |
671 | */ |
673 | */ |
672 | |
|
|
673 | void |
674 | void |
674 | esrv_del_item (player *pl, int tag) |
675 | esrv_del_item (player *pl, int tag) |
675 | { |
676 | { |
|
|
677 | if (!pl->ns) |
|
|
678 | return; |
|
|
679 | |
676 | packet sl ("delitem"); |
680 | packet sl ("delitem"); |
677 | |
681 | |
678 | sl << uint32 (tag); |
682 | sl << uint32 (tag); |
679 | |
683 | |
680 | pl->ns->send_packet (sl); |
684 | pl->ns->send_packet (sl); |
… | |
… | |
689 | |
693 | |
690 | /** |
694 | /** |
691 | * Takes a player and object count (tag) and returns the actual object |
695 | * Takes a player and object count (tag) and returns the actual object |
692 | * pointer, or null if it can't be found. |
696 | * pointer, or null if it can't be found. |
693 | */ |
697 | */ |
694 | |
|
|
695 | object * |
698 | object * |
696 | esrv_get_ob_from_count (object *pl, tag_t count) |
699 | esrv_get_ob_from_count (object *pl, tag_t count) |
697 | { |
700 | { |
698 | object *op, *tmp; |
|
|
699 | |
|
|
700 | if (pl->count == count) |
701 | if (pl->count == count) |
701 | return pl; |
702 | return pl; |
702 | |
703 | |
703 | for (op = pl->inv; op; op = op->below) |
704 | for (object *op = pl->inv; op; op = op->below) |
704 | if (op->count == count) |
705 | if (op->count == count) |
705 | return op; |
706 | return op; |
706 | else if (op->type == CONTAINER && pl->container == op) |
707 | else if (op->type == CONTAINER && pl->container == op) |
707 | for (tmp = op->inv; tmp; tmp = tmp->below) |
708 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
708 | if (tmp->count == count) |
709 | if (tmp->count == count) |
709 | return tmp; |
710 | return tmp; |
710 | |
711 | |
711 | for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) |
712 | for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) |
712 | if (op->head && op->head->count == count) |
713 | if (op->head && op->head->count == count) |
713 | return op; |
714 | return op; |
714 | else if (op->count == count) |
715 | else if (op->count == count) |
715 | return op; |
716 | return op; |
716 | else if (op->type == CONTAINER && pl->container == op) |
717 | else if (op->type == CONTAINER && pl->container == op) |
717 | for (tmp = op->inv; tmp; tmp = tmp->below) |
718 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
718 | if (tmp->count == count) |
719 | if (tmp->count == count) |
719 | return tmp; |
720 | return tmp; |
720 | |
721 | |
|
|
722 | #if 0 |
|
|
723 | /* If the high bit is set, player examined a pseudo object. */ |
|
|
724 | if (count & 0x80000000) |
|
|
725 | return 0; |
|
|
726 | #endif |
|
|
727 | |
721 | return 0; |
728 | return 0; |
722 | } |
729 | } |
723 | |
730 | |
724 | |
|
|
725 | /** Client wants to examine some object. So lets do so. */ |
731 | /** Client wants to examine some object. So lets do so. */ |
726 | void |
732 | void |
727 | ExamineCmd (char *buf, int len, player *pl) |
733 | ExamineCmd (char *buf, int len, player *pl) |
728 | { |
734 | { |
729 | tag_t tag = atoi (buf); |
735 | tag_t tag = atoi (buf); |
730 | |
|
|
731 | /* If the high bit is set, player examined a pseudo object. */ |
|
|
732 | if (tag & 0x80000000) |
|
|
733 | return; |
|
|
734 | |
736 | |
735 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
737 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
736 | |
738 | |
737 | if (!op) |
739 | if (!op) |
738 | { |
740 | { |
739 | LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); |
741 | LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); |
740 | return; |
742 | return; |
741 | } |
743 | } |
742 | |
744 | |
743 | examine (pl->ob, op); |
745 | examine (pl->ob, op); |
|
|
746 | } |
|
|
747 | |
|
|
748 | /** Client wants to examine some object. So lets do so. */ |
|
|
749 | void |
|
|
750 | ExCmd (char *buf, int len, player *pl) |
|
|
751 | { |
|
|
752 | tag_t tag = atoi (buf); |
|
|
753 | |
|
|
754 | if (object *op = esrv_get_ob_from_count (pl->ob, tag)) |
|
|
755 | { |
|
|
756 | std::string s = op->describe (pl->ob); |
|
|
757 | |
|
|
758 | packet sl ("ex"); |
|
|
759 | sl << ber32 (tag) << s.c_str (); |
|
|
760 | |
|
|
761 | pl->ns->send_packet (sl); |
|
|
762 | } |
744 | } |
763 | } |
745 | |
764 | |
746 | /** Client wants to apply some object. Lets do so. */ |
765 | /** Client wants to apply some object. Lets do so. */ |
747 | void |
766 | void |
748 | ApplyCmd (char *buf, int len, player *pl) |
767 | ApplyCmd (char *buf, int len, player *pl) |
… | |
… | |
835 | |
854 | |
836 | m = get_map_from_coord (op->map, &x, &y); |
855 | m = get_map_from_coord (op->map, &x, &y); |
837 | if (!m) |
856 | if (!m) |
838 | return; |
857 | return; |
839 | |
858 | |
840 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); |
859 | for (tmp = GET_MAP_OB (m, x, y); tmp && tmp->above; tmp = tmp->above) |
|
|
860 | ; |
841 | |
861 | |
842 | for (; tmp != NULL; tmp = tmp->below) |
862 | for (; tmp; tmp = tmp->below) |
843 | { |
863 | { |
844 | if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) |
864 | if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) |
845 | continue; |
865 | continue; |
846 | |
866 | |
847 | if (!flag) |
867 | if (!flag) |
… | |
… | |
876 | else |
896 | else |
877 | new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); |
897 | new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); |
878 | } |
898 | } |
879 | } |
899 | } |
880 | |
900 | |
881 | |
|
|
882 | |
|
|
883 | /** Client wants to look at some object. Lets do so. */ |
901 | /** Client wants to look at some object. Lets do so. */ |
884 | void |
902 | void |
885 | LookAt (char *buf, int len, player *pl) |
903 | LookAt (char *buf, int len, player *pl) |
886 | { |
904 | { |
887 | int dx, dy; |
905 | int dx, dy; |
888 | char *cp; |
906 | char *cp; |
889 | |
907 | |
890 | dx = atoi (buf); |
908 | dx = atoi (buf); |
891 | if (!(cp = strchr (buf, ' '))) |
909 | if (!(cp = strchr (buf, ' '))) |
892 | { |
|
|
893 | return; |
910 | return; |
894 | } |
911 | |
895 | dy = atoi (cp); |
912 | dy = atoi (cp); |
896 | |
|
|
897 | if (FABS (dx) > pl->ns->mapx / 2 || FABS (dy) > pl->ns->mapy / 2) |
913 | if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2) |
898 | return; |
914 | return; |
899 | |
915 | |
900 | if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) |
916 | if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) |
901 | return; |
917 | return; |
902 | |
918 | |