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.47 by root, Tue Jun 5 13:05:03 2007 UTC

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 */
335void 335void
336esrv_draw_look (object *pl) 336esrv_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.
449 */ 450 */
450void 451void
451esrv_send_inventory (object *pl, object *op) 452esrv_send_inventory (object *pl, object *op)
452{ 453{
454 if (!pl->contr->ns)//D
455 return;
456
453 int got_one = 0; 457 int got_one = 0;
454 458
455 pl->contr->ns->send_packet_printf ("delinv %d", op->count); 459 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
456 460
457 packet sl; 461 packet sl;
… …
499 * 503 *
500 * flags is a list of values to update 504 * flags is a list of values to update
501 * 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
502 * same value both places. 506 * same value both places.
503 */ 507 */
504
505void 508void
506esrv_update_item (int flags, object *pl, object *op) 509esrv_update_item (int flags, object *pl, object *op)
507{ 510{
508 /* 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. */
509 if (op != pl) 512 if (op != pl)
… …
554 ns->last_weight = weight; 557 ns->last_weight = weight;
555 } 558 }
556 559
557 if (flags & UPD_FACE) 560 if (flags & UPD_FACE)
558 { 561 {
559 if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) 562 ns->send_face (op->face);
560 esrv_send_face (ns, op->face->number, 0); 563 ns->flush_fx ();
561
562 sl << uint32 (op->face->number); 564 sl << uint32 (op->face);
563 } 565 }
564 566
565 if (flags & UPD_NAME) 567 if (flags & UPD_NAME)
566 { 568 {
567 int len; 569 int len;
… …
601 { 603 {
602 if (op->anim_speed) 604 if (op->anim_speed)
603 anim_speed = op->anim_speed; 605 anim_speed = op->anim_speed;
604 else 606 else
605 { 607 {
606 if (FABS (op->speed) < 0.001) 608 if (fabs (op->speed) < 0.001)
607 anim_speed = 255; 609 anim_speed = 255;
608 else if (FABS (op->speed) >= 1.0) 610 else if (fabs (op->speed) >= 1.0)
609 anim_speed = 1; 611 anim_speed = 1;
610 else 612 else
611 anim_speed = (int) (1.0 / FABS (op->speed)); 613 anim_speed = (int) (1.0 / fabs (op->speed));
612 } 614 }
613 615
614 if (anim_speed > 255) 616 if (anim_speed > 255)
615 anim_speed = 255; 617 anim_speed = 255;
616 } 618 }
… …
628 * Sends item's info to player. 630 * Sends item's info to player.
629 */ 631 */
630void 632void
631esrv_send_item (object *pl, object *op) 633esrv_send_item (object *pl, object *op)
632{ 634{
635 if (!pl->contr->ns)
636 return;
637
633 /* If this is not the player object, do some more checks */ 638 /* If this is not the player object, do some more checks */
634 if (op != pl) 639 if (op != pl)
635 { 640 {
636 /* We only send 'visibile' objects to the client */ 641 /* We only send 'visibile' objects to the client */
637 if (!op->client_visible ()) 642 if (!op->client_visible ())
… …
664 669
665/** 670/**
666 * Tells the client to delete an item. Uses the item 671 * Tells the client to delete an item. Uses the item
667 * command with a -1 location. 672 * command with a -1 location.
668 */ 673 */
669
670void 674void
671esrv_del_item (player *pl, int tag) 675esrv_del_item (player *pl, int tag)
672{ 676{
677 if (!pl->ns)
678 return;
679
673 packet sl ("delitem"); 680 packet sl ("delitem");
674 681
675 sl << uint32 (tag); 682 sl << uint32 (tag);
676 683
677 pl->ns->send_packet (sl); 684 pl->ns->send_packet (sl);
… …
686 693
687/** 694/**
688 * 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
689 * pointer, or null if it can't be found. 696 * pointer, or null if it can't be found.
690 */ 697 */
691
692object * 698object *
693esrv_get_ob_from_count (object *pl, tag_t count) 699esrv_get_ob_from_count (object *pl, tag_t count)
694{ 700{
695 object *op, *tmp;
696
697 if (pl->count == count) 701 if (pl->count == count)
698 return pl; 702 return pl;
699 703
700 for (op = pl->inv; op; op = op->below) 704 for (object *op = pl->inv; op; op = op->below)
701 if (op->count == count) 705 if (op->count == count)
702 return op; 706 return op;
703 else if (op->type == CONTAINER && pl->container == op) 707 else if (op->type == CONTAINER && pl->container == op)
704 for (tmp = op->inv; tmp; tmp = tmp->below) 708 for (object *tmp = op->inv; tmp; tmp = tmp->below)
705 if (tmp->count == count) 709 if (tmp->count == count)
706 return tmp; 710 return tmp;
707 711
708 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)
709 if (op->head && op->head->count == count) 713 if (op->head && op->head->count == count)
710 return op; 714 return op;
711 else if (op->count == count) 715 else if (op->count == count)
712 return op; 716 return op;
713 else if (op->type == CONTAINER && pl->container == op) 717 else if (op->type == CONTAINER && pl->container == op)
714 for (tmp = op->inv; tmp; tmp = tmp->below) 718 for (object *tmp = op->inv; tmp; tmp = tmp->below)
715 if (tmp->count == count) 719 if (tmp->count == count)
716 return tmp; 720 return tmp;
717 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
718 return 0; 728 return 0;
719} 729}
720 730
721
722/** Client wants to examine some object. So lets do so. */ 731/** Client wants to examine some object. So lets do so. */
723void 732void
724ExamineCmd (char *buf, int len, player *pl) 733ExamineCmd (char *buf, int len, player *pl)
725{ 734{
726 tag_t tag = atoi (buf); 735 tag_t tag = atoi (buf);
727 736
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); 737 object *op = esrv_get_ob_from_count (pl->ob, tag);
733 738
734 if (!op) 739 if (!op)
735 { 740 {
736 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);
737 return; 742 return;
738 } 743 }
739 744
740 examine (pl->ob, op); 745 examine (pl->ob, op);
746}
747
748/** Client wants to examine some object. So lets do so. */
749void
750ExCmd (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 }
741} 763}
742 764
743/** Client wants to apply some object. Lets do so. */ 765/** Client wants to apply some object. Lets do so. */
744void 766void
745ApplyCmd (char *buf, int len, player *pl) 767ApplyCmd (char *buf, int len, player *pl)
… …
814 * look_at prints items on the specified square. 836 * look_at prints items on the specified square.
815 * 837 *
816 * [ removed EARTHWALL check and added check for containers inventory. 838 * [ removed EARTHWALL check and added check for containers inventory.
817 * Tero.Haatanen@lut.fi ] 839 * Tero.Haatanen@lut.fi ]
818 */ 840 */
819void 841static void
820look_at (object *op, int dx, int dy) 842look_at (player *pl, int dx, int dy)
821{ 843{
822 object *tmp; 844 object *ob = pl->ob;
845
846 maptile *m = pl->observe->map;
847 sint16 x = pl->observe->x + dx;
848 sint16 y = pl->observe->y + dy;
849
850 if (!xy_normalise (m, x, y))
851 {
852 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
853 return;
854 }
855
823 int flag = 0; 856 int flag = 0;
824 sint16 x, y;
825 maptile *m;
826 857
827 x = op->x + dx; 858 for (object *tmp = m->at (x, y).top; tmp; tmp = tmp->below)
828 y = op->y + dy;
829
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)
835 return;
836
837 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
838
839 for (; tmp != NULL; tmp = tmp->below)
840 { 859 {
841 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 860 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
842 continue; 861 continue;
843 862
844 if (!flag) 863 if (!flag)
845 { 864 {
846 if (dx || dy) 865 if (dx || dy)
847 new_draw_info (NDI_UNIQUE, 0, op, "There you see:"); 866 new_draw_info (NDI_UNIQUE, 0, ob, "There you see:");
848 else 867 else
849 {
850 clear_win_info (op);
851 new_draw_info (NDI_UNIQUE, 0, op, "You see:"); 868 new_draw_info (NDI_UNIQUE, 0, ob, "You see:");
852 } 869
853 flag = 1; 870 flag = 1;
854 } 871 }
855 872
856 if (QUERY_FLAG (op, FLAG_WIZ)) 873 if (QUERY_FLAG (ob, FLAG_WIZ))
857 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count); 874 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s (%d).", query_name (tmp), tmp->count);
858 else 875 else
859 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp)); 876 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s.", query_name (tmp));
860 877
861 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) && 878 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
862 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ)) 879 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (ob, FLAG_WIZ))
863 inventory (op, tmp->head == NULL ? tmp : tmp->head); 880 inventory (ob, tmp->head == NULL ? tmp : tmp->head);
864 881
865 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */ 882 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
866 break; 883 break;
867 } 884 }
868 885
869 if (!flag) 886 if (!flag)
870 { 887 {
871 if (dx || dy) 888 if (dx || dy)
872 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there."); 889 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
873 else 890 else
874 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); 891 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing.");
875 } 892 }
876} 893}
877
878
879 894
880/** Client wants to look at some object. Lets do so. */ 895/** Client wants to look at some object. Lets do so. */
881void 896void
882LookAt (char *buf, int len, player *pl) 897LookAt (char *buf, int len, player *pl)
883{ 898{
884 int dx, dy; 899 int dx, dy;
885 char *cp; 900 char *cp;
886 901
887 dx = atoi (buf); 902 dx = atoi (buf);
888 if (!(cp = strchr (buf, ' '))) 903 if (!(cp = strchr (buf, ' ')))
889 {
890 return; 904 return;
891 } 905
892 dy = atoi (cp); 906 dy = atoi (cp);
893
894 if (FABS (dx) > pl->ns->mapx / 2 || FABS (dy) > pl->ns->mapy / 2) 907 if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2)
895 return; 908 return;
896 909
897 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) 910 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
898 return; 911 return;
899 912
900 look_at (pl->ob, dx, dy); 913 look_at (pl, dx, dy);
901} 914}
902 915
903/** Move an object to a new location */ 916/** Move an object to a new location */
904void 917void
905esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 918esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)

Diff Legend

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