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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.33 by root, Tue Dec 12 21:39:57 2006 UTC vs.
Revision 1.34 by root, Wed Dec 13 03:28:42 2006 UTC

1882 if (arrow == NULL) 1882 if (arrow == NULL)
1883 { 1883 {
1884 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1884 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1885 return 0; 1885 return 0;
1886 } 1886 }
1887 set_owner (arrow, op); 1887 arrow->set_owner (op);
1888 arrow->skill = bow->skill; 1888 arrow->skill = bow->skill;
1889 1889
1890 arrow->direction = dir; 1890 arrow->direction = dir;
1891 arrow->x = sx; 1891 arrow->x = sx;
1892 arrow->y = sy; 1892 arrow->y = sy;
2359 * player owns it and it is either friendly or unagressive. 2359 * player owns it and it is either friendly or unagressive.
2360 */ 2360 */
2361 if ((op->type == PLAYER) 2361 if ((op->type == PLAYER)
2362#if COZY_SERVER 2362#if COZY_SERVER
2363 && 2363 &&
2364 ((get_owner (mon) && get_owner (mon)->contr 2364 ((mon->owner && mon->owner->contr
2365 && same_party (get_owner (mon)->contr->party, op->contr->party)) || get_owner (mon) == op) 2365 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)
2366#else 2366#else
2367 && get_owner (mon) == op 2367 && mon->owner == op
2368#endif 2368#endif
2369 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2369 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2370 { 2370 {
2371 /* If we're braced, we don't want to switch places with it */ 2371 /* If we're braced, we don't want to switch places with it */
2372 if (op->contr->braced) 2372 if (op->contr->braced)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines