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.50 by elmex, Wed Dec 20 10:31:00 2006 UTC vs.
Revision 1.51 by root, Thu Dec 21 06:12:37 2006 UTC

327 CLEAR_FLAG (p->ob, FLAG_FRIENDLY); 327 CLEAR_FLAG (p->ob, FLAG_FRIENDLY);
328 add_friendly_object (p->ob); 328 add_friendly_object (p->ob);
329 send_rules (p->ob); 329 send_rules (p->ob);
330 send_news (p->ob); 330 send_news (p->ob);
331 display_motd (p->ob); 331 display_motd (p->ob);
332
332 get_name (p->ob); 333 get_name (p->ob);
333 334
334 return 0; 335 return 0;
335} 336}
336 337
725 * to leave it to play_again to remove the object in all 726 * to leave it to play_again to remove the object in all
726 * cases. 727 * cases.
727 */ 728 */
728 if (!QUERY_FLAG (op, FLAG_REMOVED)) 729 if (!QUERY_FLAG (op, FLAG_REMOVED))
729 op->remove (); 730 op->remove ();
731
730 /* Need to set this to null - otherwise, it could point to garbage, 732 /* Need to set this to null - otherwise, it could point to garbage,
731 * and draw() doesn't check to see if the player is removed, only if 733 * and draw() doesn't check to see if the player is removed, only if
732 * the map is null or not swapped out. 734 * the map is null or not swapped out.
733 */ 735 */
734 op->map = NULL; 736 op->map = NULL;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines