ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/item.C
(Generate patch)

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.32 by root, Tue Jan 9 21:32:43 2007 UTC vs.
Revision 1.51 by root, Tue Jul 24 04:55:35 2007 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines