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

Comparing deliantra/server/server/pets.C (file contents):
Revision 1.38 by root, Sun Jul 1 05:00:20 2007 UTC vs.
Revision 1.39 by root, Wed Aug 15 18:11:14 2007 UTC

695 } 695 }
696 696
697 if (op->type == PLAYER) 697 if (op->type == PLAYER)
698 { 698 {
699 tmp->type = GOLEM; 699 tmp->type = GOLEM;
700 tmp->set_owner (op);
701 op->contr->golem = tmp; 700 op->contr->golem = tmp;
702 /* give the player control of the golem */ 701 /* give the player control of the golem */
703 set_spell_skill (op, caster, spob, tmp); 702 set_spell_skill (op, caster, spob, tmp);
704 }
705 else
706 {
707 if (QUERY_FLAG (op, FLAG_FRIENDLY))
708 {
709 object *owner = op->owner;
710
711 if (owner)
712 { /* For now, we transfer ownership */
713 tmp->set_owner (owner);
714 tmp->attack_movement = PETMOVE;
715 add_friendly_object (tmp);
716 }
717 }
718
719 SET_FLAG (tmp, FLAG_MONSTER);
720 } 703 }
721 704
722 /* make the speed positive. */ 705 /* make the speed positive. */
723 tmp->speed = FABS (tmp->speed); 706 tmp->speed = FABS (tmp->speed);
724 707

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines