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.37 by root, Sat Feb 10 01:52:29 2007 UTC

… …
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 }
… …
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;
… …
601 { 604 {
602 if (op->anim_speed) 605 if (op->anim_speed)
603 anim_speed = op->anim_speed; 606 anim_speed = op->anim_speed;
604 else 607 else
605 { 608 {
606 if (FABS (op->speed) < 0.001) 609 if (fabs (op->speed) < 0.001)
607 anim_speed = 255; 610 anim_speed = 255;
608 else if (FABS (op->speed) >= 1.0) 611 else if (fabs (op->speed) >= 1.0)
609 anim_speed = 1; 612 anim_speed = 1;
610 else 613 else
611 anim_speed = (int) (1.0 / FABS (op->speed)); 614 anim_speed = (int) (1.0 / fabs (op->speed));
612 } 615 }
613 616
614 if (anim_speed > 255) 617 if (anim_speed > 255)
615 anim_speed = 255; 618 anim_speed = 255;
616 } 619 }
… …
628 * Sends item's info to player. 631 * Sends item's info to player.
629 */ 632 */
630void 633void
631esrv_send_item (object *pl, object *op) 634esrv_send_item (object *pl, object *op)
632{ 635{
636 if (!pl->contr->ns)
637 return;
638
633 /* If this is not the player object, do some more checks */ 639 /* If this is not the player object, do some more checks */
634 if (op != pl) 640 if (op != pl)
635 { 641 {
636 /* We only send 'visibile' objects to the client */ 642 /* We only send 'visibile' objects to the client */
637 if (!op->client_visible ()) 643 if (!op->client_visible ())
… …
668 */ 674 */
669 675
670void 676void
671esrv_del_item (player *pl, int tag) 677esrv_del_item (player *pl, int tag)
672{ 678{
679 if (!pl->ns)
680 return;
681
673 packet sl ("delitem"); 682 packet sl ("delitem");
674 683
675 sl << uint32 (tag); 684 sl << uint32 (tag);
676 685
677 pl->ns->send_packet (sl); 686 pl->ns->send_packet (sl);
… …
873 else 882 else
874 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); 883 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
875 } 884 }
876} 885}
877 886
878
879
880/** Client wants to look at some object. Lets do so. */ 887/** Client wants to look at some object. Lets do so. */
881void 888void
882LookAt (char *buf, int len, player *pl) 889LookAt (char *buf, int len, player *pl)
883{ 890{
884 int dx, dy; 891 int dx, dy;
… …
889 { 896 {
890 return; 897 return;
891 } 898 }
892 dy = atoi (cp); 899 dy = atoi (cp);
893 900
894 if (FABS (dx) > pl->ns->mapx / 2 || FABS (dy) > pl->ns->mapy / 2) 901 if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2)
895 return; 902 return;
896 903
897 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) 904 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
898 return; 905 return;
899 906

Diff Legend

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