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.71 by root, Mon Sep 8 11:27:25 2008 UTC vs.
Revision 1.74 by root, Mon Dec 8 15:55:00 2008 UTC

399 if (flags & UPD_FLAGS) 399 if (flags & UPD_FLAGS)
400 sl << uint32 (query_flags (op)); 400 sl << uint32 (query_flags (op));
401 401
402 if (flags & UPD_WEIGHT) 402 if (flags & UPD_WEIGHT)
403 { 403 {
404 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight (); 404 sint32 weight = op->client_weight ();
405 405
406 if (op) 406 if (op == pl)
407 ns->last_weight = weight; 407 ns->last_weight = weight;
408 408
409 sl << uint32 (weight); 409 sl << uint32 (weight);
410 } 410 }
411 411
733 if (client *ns = opl->ns) 733 if (client *ns = opl->ns)
734 { 734 {
735 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2) 735 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
736 return; 736 return;
737 737
738 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2]) 738 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2] >= LOS_MAX)
739 return; 739 return;
740 } 740 }
741 741
742 look_at (pl, dx, dy); 742 look_at (pl, dx, dy);
743} 743}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines