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.58 by root, Sun Nov 29 09:41:28 2009 UTC vs.
Revision 1.59 by root, Sun Nov 29 17:41:08 2009 UTC

446{ 446{
447 object *tmp = NULL, *prev = NULL, *head = NULL; 447 object *tmp = NULL, *prev = NULL, *head = NULL;
448 448
449 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more) 449 for (archetype *atmp = at; atmp; atmp = (archetype *)atmp->more)
450 { 450 {
451 tmp = arch_to_object (atmp); 451 tmp = atmp->instance ();
452 452
453 if (atmp == at) 453 if (atmp == at)
454 { 454 {
455 if (!is_golem) 455 if (!is_golem)
456 SET_FLAG (tmp, FLAG_MONSTER); 456 SET_FLAG (tmp, FLAG_MONSTER);
989 return nrof > 1; 989 return nrof > 1;
990 } 990 }
991 991
992 for (archetype *atmp = summon_arch; atmp; atmp = (archetype *)atmp->more) 992 for (archetype *atmp = summon_arch; atmp; atmp = (archetype *)atmp->more)
993 { 993 {
994 tmp = arch_to_object (atmp); 994 tmp = atmp->instance ();
995 if (atmp == summon_arch) 995 if (atmp == summon_arch)
996 { 996 {
997 if (QUERY_FLAG (tmp, FLAG_MONSTER)) 997 if (QUERY_FLAG (tmp, FLAG_MONSTER))
998 { 998 {
999 tmp->set_owner (op); 999 tmp->set_owner (op);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines