[ViewVC] Diff of: cvs/deliantra/server/server/pets.C

Comparing deliantra/server/server/pets.C (file contents):
Revision 1.47 by root, Mon Sep 29 10:20:49 2008 UTC vs.
Revision 1.49 by root, Mon Dec 29 07:43:36 2008 UTC

     {
       object *ob = obl->ob;
       next = obl->next;
       if (ob->owner == owner)
-        {
-          op->destroy_inv (true); // be explicit about dropping
-          ob->destroy (true);
+        ob->drop_and_destroy ();
-        }
     }
 }
 /*
  * Unfortunately, sometimes, the owner of a pet is in the
           return 0;
         }
     }
-  ob->destroy_inv (true); // be explicit about dropping
+  ob->drop_and_destroy ();
-  ob->destroy (true);
   return 1;
 }
 void
   maptile *m;
   /* Check to see if player pulled out */
   if ((owner = ob->owner) == NULL)
     {
-      op->destroy_inv (true); // be explicit about dropping
-      ob->destroy (true);
+      ob->drop_and_destroy ();
       LOG (llevMonster, "Pet: no owner, leaving.\n");
       return;
     }
   /* move monster into the owners map if not in the same map
     return;                     /* Has already been moved */
   if (!op->owner)
     {
       LOG (llevDebug, "Golem without owner destructed.\n");
-      op->destroy_inv (true); // be explicit about dropping
-      op->destroy (true);
+      op->drop_and_destroy ();
       return;
     }
   /* It would be nice to have a cleaner way of what message to print
    * when the golem expires than these hard coded entries.
   if (--op->stats.hp < 0)
     {
       if (op->msg)
         new_draw_info (NDI_UNIQUE, 0, op->owner, op->msg);
-      op->destroy_inv (true); // be explicit about dropping
-      op->destroy (true);
+      op->drop_and_destroy ();
       return;
     }
   /* Do golem attacks/movement for single & multisq golems.
    * Assuming here that op is the 'head' object. Pass only op to
 control_golem (object *op, int dir)
 {
   op->direction = dir;
 }
-/* summon golem: summons a monster for 'op'.  caster is the object
+/* summon golem: summons a monster for 'op'. caster is the object
  * casting the spell, dir is the direction to place the monster,
  * at is the archetype of the monster, and spob is the spell
  * object.  At this stage, all spob is really used for is to
  * adjust some values in the monster.
  */
    * 'lose' their old golem.
    */
   if (op->type == PLAYER && op->contr->golem)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "You dismiss your existing golem.");
-      op->contr->holem->destroy_inv (true); // be explicit about dropping
-      op->contr->golem->destroy (true);
+      op->contr->golem->drop_and_destroy ();
       op->contr->golem = 0;
     }
   if (spob->other_arch)
     at = spob->other_arch;
       if (!(tmp->attacktype & AT_PHYSICAL))
         tmp->attacktype |= AT_PHYSICAL;
     }
   insert_ob_in_map (tmp, tmp->map, op, 0);
   return 1;
 }
 /***************************************************************************
 /* Returns a monster (chosen at random) that this particular player (and his
  * god) find acceptable.  This checks level, races allowed by god, etc
  * to determine what is acceptable.
  * This returns NULL if no match was found.
  */
 object *
 choose_cult_monster (object *pl, object *god, int summon_level)
 {
   char buf[MAX_BUF];
   const char *race;
    * a valid entry, assuming nothing is available and quit.
    */
   if (!mon_nr)
     return NULL;
-  mon_nr = rndm (0, mon_nr - 1);
+  mon_nr = rndm (mon_nr - 1);
   for (tobl = list->member; tobl; tobl = tobl->next)
     {
       otmp = tobl->ob;
       if (!otmp || !QUERY_FLAG (otmp, FLAG_MONSTER))
         continue;
       if (otmp->level <= summon_level && !mon_nr--)
         return otmp;
     }
   /* This should not happen */
   LOG (llevDebug, "choose_cult_monster() mon_nr was set, but did not find a monster\n");
   return NULL;
 }
     }                           /* for i < nrof */
   return 1;
 }
-/* recursively look through the owner property of objects until the real owner
-is found */
-object *
-get_real_owner (object *ob)
-{
-  object *realowner = ob;
-  if (realowner == NULL)
-    return NULL;
-  while (realowner->owner != NULL)
-    {
-      realowner = realowner->owner;
-    }
-  return realowner;
-}
 /* determines if checks so pets don't attack players or other pets should be
 overruled by the arena petmode */
 int
 should_arena_attack (object *pet, object *owner, object *target)
 {
   if ((target == NULL) || (pet == NULL) || (owner == NULL))
     return 0;
   /* get the owners of itself and the target, this is to deal with pets of
      pets */
-  rowner = get_real_owner (owner);
+  rowner = owner->outer_owner ();
-  towner = target->type == PLAYER ? 0 : get_real_owner (target);
+  towner = target->is_player () ? 0 : target->outer_owner ();
   /* if the pet has now owner, exit with error */
   if (!rowner)
     {
       LOG (llevError, "Pet has no owner.\n");
       return 0;
     }
   /* if the target is not a player, and has no owner, we shouldn't be here
    */
-  if ((towner == NULL) && (target->type != PLAYER))
+  if (!towner && !target->is_player ())
     {
       LOG (llevError, "Target is not a player but has no owner. We should not be here.\n");
       return 0;
     }
   /* make sure that the owner is a player */
-  if (rowner->type != PLAYER)
+  if (!rowner->is_player ())
     return 0;
   /* abort if the petmode is not arena */
   if (rowner->contr->petmode != pet_arena)
     return 0;
   /* abort if the pet, it's owner, or the target is not on battleground */
   if (!(op_on_battleground (pet, NULL, NULL) && op_on_battleground (owner, NULL, NULL) && op_on_battleground (target, NULL, NULL)))
     return 0;
   /* if the target is a monster, make sure it's owner is not the same */
-  if ((target->type != PLAYER) && (rowner == towner))
+  if (!target->is_player () && rowner == towner)
     return 0;
   /* check if the target is a player which affects how it will handle
      parties */
-  if (target->type != PLAYER)
+  if (!target->is_player ())
     {
       /* if the target is owned by a player make sure than make sure
          it's not in the same party */
-      if ((towner->type == PLAYER) && (rowner->contr->party != NULL))
+      if (towner->is_player () && rowner->contr->party)
-        {
-          if (rowner->contr->party == towner->contr->party)
+        if (rowner->contr->party == towner->contr->party)
-            return 0;
+          return 0;
-        }
     }
   else
     {
       /* if the target is a player make sure than make sure it's not
          in the same party */
-      if (rowner->contr->party != NULL)
+      if (rowner->contr->party)
-        {
-          if (rowner->contr->party == target->contr->party)
+        if (rowner->contr->party == target->contr->party)
-            return 0;
+          return 0;
-        }
     }
   return 1;
 }

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/server/pets.C (file contents): Revision 1.47 by root, Mon Sep 29 10:20:49 2008 UTC vs. Revision 1.49 by root, Mon Dec 29 07:43:36 2008 UTC

Diff Legend

Comparing deliantra/server/server/pets.C (file contents):
Revision 1.47 by root, Mon Sep 29 10:20:49 2008 UTC vs.
Revision 1.49 by root, Mon Dec 29 07:43:36 2008 UTC