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

Comparing deliantra/server/server/pets.C (file contents):
Revision 1.12 by root, Sat Dec 9 16:11:09 2006 UTC vs.
Revision 1.19 by root, Wed Jan 3 20:32:13 2007 UTC

     The authors can be reached via e-mail at <crossfire@schmorp.de>
 */
 #include <global.h>
-#ifndef __CEXTRACT__
-# include <sproto.h>
+#include <sproto.h>
-#endif
 /* given that 'pet' is a friendly object, this function returns a
  * monster the pet should attack, NULL if nothing appropriate is
  * found.  it basically looks for nasty things around the owner
  * of the pet to attack.
  * this is now tilemap aware.
  */
 object *
 get_pet_enemy (object *pet, rv_vector * rv)
 {
   object *owner, *tmp, *attacker, *tmp3;
   int i;
   int mflags;
   attacker = pet->attacked_by;  /*pointer to attacking enemy */
   pet->attacked_by = NULL;      /*clear this, since we are dealing with it */
-  if ((owner = get_owner (pet)) != NULL)
+  if ((owner = pet->owner) != NULL)
     {
       /* If the owner has turned on the pet, make the pet
        * unfriendly.
        */
       if ((check_enemy (owner, rv)) == pet)
          */
         pet->enemy = NULL;
       else
         return tmp;
     }
   get_search_arr (search_arr);
   if (owner->type == PLAYER && owner->contr->petmode > pet_normal)
     {
       if (owner->contr->petmode == pet_sad)
       x = owner->x + freearr_x[search_arr[i]];
       y = owner->y + freearr_y[search_arr[i]];
       nm = owner->map;
       /* Only look on the space if there is something alive there. */
       mflags = get_map_flags (nm, &nm, x, y, &x, &y);
       if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE)
         {
-          for (tmp = get_map_ob (nm, x, y); tmp != NULL; tmp = tmp->above)
+          for (tmp = GET_MAP_OB (nm, x, y); tmp != NULL; tmp = tmp->above)
             {
               object *tmp2 = tmp->head == NULL ? tmp : tmp->head;
               if (QUERY_FLAG (tmp2, FLAG_ALIVE) && ((!QUERY_FLAG (tmp2, FLAG_FRIENDLY) &&
                                                      (tmp2->type != PLAYER)) ||
           nm = pet->map;
           /* Only look on the space if there is something alive there. */
           mflags = get_map_flags (nm, &nm, x, y, &x, &y);
           if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE)
             {
-              for (tmp = get_map_ob (nm, x, y); tmp != NULL; tmp = tmp->above)
+              for (tmp = GET_MAP_OB (nm, x, y); tmp != NULL; tmp = tmp->above)
                 {
                   object *tmp2 = tmp->head == NULL ? tmp : tmp->head;
                   if (QUERY_FLAG (tmp2, FLAG_ALIVE) && ((!QUERY_FLAG (tmp2, FLAG_FRIENDLY) &&
                                                          (tmp2->type != PLAYER)) ||
   for (obl = first_friendly_object; obl != NULL; obl = next)
     {
       object *ob = obl->ob;
       next = obl->next;
-      if (get_owner (ob) == owner)
+      if (ob->owner == owner)
         {
           if (!QUERY_FLAG (ob, FLAG_REMOVED))
-            remove_ob (ob);
+            ob->remove ();
           remove_friendly_object (ob);
-          free_object (ob);
+          ob->destroy ();
         }
     }
 }
 /*
  * Thus the map isn't loaded yet, and we have to remove
  * the pet...
  * Interesting enough, we don't use the passed map structure in
  * this function.
  */
 void
 remove_all_pets (maptile *map)
 {
   objectlink *obl, *next;
   object *owner;
   for (obl = first_friendly_object; obl != NULL; obl = next)
     {
       next = obl->next;
       if (obl->ob->type != PLAYER && QUERY_FLAG (obl->ob, FLAG_FRIENDLY) &&
-          (owner = get_owner (obl->ob)) != NULL && !on_same_map (owner, obl->ob))
+          (owner = obl->ob->owner) != NULL && !on_same_map (owner, obl->ob))
         {
           /* follow owner checks map status for us */
           follow_owner (obl->ob, owner);
         }
     }
 {
   object *tmp;
   int dir;
   if (!QUERY_FLAG (ob, FLAG_REMOVED))
-    remove_ob (ob);
+    ob->remove ();
   if (owner->map == NULL)
     {
       LOG (llevError, "Can't follow owner (%d): no map.\n", &owner->name);
       goto fail;
   return 0;
 fail:
   remove_friendly_object (ob);
-  free_object (ob);
+  ob->destroy ();
   return 1;
 }
 void
   sint16 dx, dy;
   object *ob2, *owner;
   maptile *m;
   /* Check to see if player pulled out */
-  if ((owner = get_owner (ob)) == NULL)
+  if ((owner = ob->owner) == NULL)
     {
-      remove_ob (ob);           /* Will be freed when returning */
+      ob->remove ();           /* Will be freed when returning */
       remove_friendly_object (ob);
-      free_object (ob);
+      ob->destroy ();
       LOG (llevMonster, "Pet: no owner, leaving.\n");
       return;
     }
   /* move monster into the owners map if not in the same map */
           dy = part->y + freearr_y[dir];
           m = get_map_from_coord (part->map, &dx, &dy);
           if (!m)
             continue;
-          for (ob2 = get_map_ob (m, dx, dy); ob2 != NULL; ob2 = ob2->above)
+          for (ob2 = GET_MAP_OB (m, dx, dy); ob2 != NULL; ob2 = ob2->above)
             {
               object *new_ob;
               new_ob = ob2->head ? ob2->head : ob2;
               if (new_ob == ob)
                 break;
               if (new_ob == ob->owner)
                 return;
-              if (get_owner (new_ob) == ob->owner)
+              if (new_ob->owner == ob->owner)
                 break;
               /* Hmm.  Did we try to move into an enemy monster?  If so,
                * make it our enemy.
                */
 fix_summon_pet (archetype *at, object *op, int dir, int is_golem)
 {
   archetype *atmp;
   object *tmp = NULL, *prev = NULL, *head = NULL;
-  for (atmp = at; atmp != NULL; atmp = atmp->more)
+  for (atmp = at; atmp; atmp = atmp->more)
     {
       tmp = arch_to_object (atmp);
       if (atmp == at)
         {
           if (!is_golem)
             SET_FLAG (tmp, FLAG_MONSTER);
-          set_owner (tmp, op);
+          tmp->set_owner (op);
           if (op->type == PLAYER)
             {
               tmp->stats.exp = 0;
               add_friendly_object (tmp);
               SET_FLAG (tmp, FLAG_FRIENDLY);
             }
           else
             {
               if (QUERY_FLAG (op, FLAG_FRIENDLY))
                 {
-                  object *owner = get_owner (op);
+                  object *owner = op->owner;
-                  if (owner != NULL)
+                  if (owner)
                     {           /* For now, we transfer ownership */
-                      set_owner (tmp, owner);
+                      tmp->set_owner (owner);
                       tmp->attack_movement = PETMOVE;
                       add_friendly_object (tmp);
                       SET_FLAG (tmp, FLAG_FRIENDLY);
                     }
                 }
             }
           if (op->type != PLAYER || !is_golem)
             {
               tmp->attack_movement = PETMOVE;
               tmp->speed_left = -1;
               tmp->type = 0;
             }
           else
             tmp->type = GOLEM;
         }
-      if (head == NULL)
+      if (!head)
         head = tmp;
       tmp->x = op->x + freearr_x[dir] + tmp->arch->clone.x;
       tmp->y = op->y + freearr_y[dir] + tmp->arch->clone.y;
       tmp->map = op->map;
       if (tmp->invisible)
         tmp->invisible = 0;
       if (head != tmp)
         tmp->head = head, prev->more = tmp;
       prev = tmp;
     }
   head->direction = dir;
   /* need to change some monster attr to prevent problems/crashing */
   head->last_heal = 0;
   head->last_eat = 0;
   return head;
 }
 /* updated this to allow more than the golem 'head' to attack */
 /* op is the golem to be moved. */
 void
 move_golem (object *op)
 {
   int made_attack = 0;
   object *tmp;
   if (QUERY_FLAG (op, FLAG_MONSTER))
     return;                     /* Has already been moved */
-  if (get_owner (op) == NULL)
+  if (op->owner == NULL)
     {
       LOG (llevDebug, "Golem without owner destructed.\n");
-      remove_ob (op);
+      op->remove ();
-      free_object (op);
+      op->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->msg)
         new_draw_info (NDI_UNIQUE, 0, op->owner, op->msg);
       op->owner->contr->ranges[range_golem] = 0;
       remove_friendly_object (op);
-      remove_ob (op);
+      op->remove ();
-      free_object (op);
+      op->destroy ();
       return;
     }
   /* Do golem attacks/movement for single & multisq golems.
    * Assuming here that op is the 'head' object. Pass only op to
       mflags = get_map_flags (m, &m, x, y, &x, &y);
       if (mflags & P_OUT_OF_MAP)
         continue;
-      for (victim = get_map_ob (op->map, x, y); victim; victim = victim->above)
+      for (victim = GET_MAP_OB (op->map, x, y); victim; victim = victim->above)
         if (QUERY_FLAG (victim, FLAG_ALIVE))
           break;
       /* We used to call will_hit_self to make sure we don't
        * hit ourselves, but that didn't work, and I don't really
    * 'lose' their old golem.
    */
   if (op->type == PLAYER && op->contr->ranges[range_golem])
     {
       new_draw_info (NDI_UNIQUE, 0, op, "You dismiss your existing golem.");
-      remove_ob (op->contr->ranges[range_golem]);
+      op->contr->ranges[range_golem]->remove ();
-      free_object (op->contr->ranges[range_golem]);
+      op->contr->ranges[range_golem]->destroy ();
       op->contr->ranges[range_golem] = 0;
     }
   if (spob->other_arch)
     at = spob->other_arch;
   if (dir == -1 || ob_blocked (&at->clone, op->map, op->x + freearr_x[dir], op->y + freearr_y[dir]))
     {
       new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
       return 0;
     }
   /* basically want to get proper map/coordinates for this object */
   if (!(tmp = fix_summon_pet (at, op, dir, GOLEM)))
     {
       new_draw_info (NDI_UNIQUE, 0, op, "Your spell fails.");
     }
   if (op->type == PLAYER)
     {
       tmp->type = GOLEM;
-      set_owner (tmp, op);
+      tmp->set_owner (op);
       set_spell_skill (op, caster, spob, tmp);
       op->contr->ranges[range_golem] = tmp;
       /* give the player control of the golem */
       op->contr->shoottype = range_golem;
     }
   else
     {
       if (QUERY_FLAG (op, FLAG_FRIENDLY))
         {
-          object *owner = get_owner (op);
+          object *owner = op->owner;
-          if (owner != NULL)
+          if (owner)
             {                   /* For now, we transfer ownership */
-              set_owner (tmp, owner);
+              tmp->set_owner (owner);
               tmp->attack_movement = PETMOVE;
               add_friendly_object (tmp);
               SET_FLAG (tmp, FLAG_FRIENDLY);
             }
         }
        * with all the checks in the 'for' portion itself.  Much
        * more readable to break some of the conditions out.
        */
       for (tr = spell_ob->randomitems->items; tr; tr = tr->next)
         {
+          if (!tr->item)
+            continue;
           if (level < tr->magic)
             break;
           lasttr = tr;
           if (tr->item->name == sparam)
-            break;
-          if (!tr->next || !tr->next->item)
             break;
         }
       if (!lasttr)
         {
           new_draw_info (NDI_UNIQUE, 0, op, "The spell fails to summon any monsters.");
           return 0;
         }
       summon_arch = lasttr->item;
-      nrof = lasttr->nrof;
+      nrof        = lasttr->nrof;
     }
   else if (spell_ob->race && !strcmp (spell_ob->race, "GODCULTMON"))
     {
       object *god = find_god (determine_god (op)), *mon, *owner;
       int summon_level, tries;
-      if (!god && ((owner = get_owner (op)) != NULL))
+      if (!god && ((owner = op->owner) != NULL))
         god = find_god (determine_god (owner));
       /* If we can't find a god, can't get what monster to summon */
       if (!god)
         return 0;
           tmp = arch_to_object (atmp);
           if (atmp == summon_arch)
             {
               if (QUERY_FLAG (tmp, FLAG_MONSTER))
                 {
-                  set_owner (tmp, op);
+                  tmp->set_owner (op);
                   set_spell_skill (op, caster, spell_ob, tmp);
                   tmp->enemy = op->enemy;
                   tmp->type = 0;
                   CLEAR_FLAG (tmp, FLAG_SLEEP);
                           tmp->stats.exp = 0;
                           if (spell_ob->attack_movement)
                             tmp->attack_movement = spell_ob->attack_movement;
-                          if (get_owner (op))
+                          if (op->owner)
-                            set_owner (tmp, get_owner (op));
+                            tmp->set_owner (op->owner);
                         }
                     }
                 }
               if (tmp->speed > MIN_ACTIVE_SPEED)
       head->stats.exp = 0;
       head = insert_ob_in_map (head, head->map, op, 0);
       if (head && head->randomitems)
         {
-          object *tmp;
           create_treasure (head->randomitems, head, GT_APPLY | GT_STARTEQUIP, 6, 0);
-          for (tmp = head->inv; tmp; tmp = tmp->below)
+          for (object *tmp = head->inv; tmp; tmp = tmp->below)
-            if (!tmp->nrof)
-              SET_FLAG (tmp, FLAG_NO_DROP);
+            SET_FLAG (tmp, FLAG_NO_DROP);
         }
     }                           /* for i < nrof */
   return 1;
 }
   object *realowner = ob;
   if (realowner == NULL)
     return NULL;
-  while (get_owner (realowner) != NULL)
+  while (realowner->owner != NULL)
     {
-      realowner = get_owner (realowner);
+      realowner = realowner->owner;
     }
   return realowner;
 }
 /* determines if checks so pets don't attack players or other pets should be

Diff Legend

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

Comparing deliantra/server/server/pets.C (file contents): Revision 1.12 by root, Sat Dec 9 16:11:09 2006 UTC vs. Revision 1.19 by root, Wed Jan 3 20:32:13 2007 UTC

Diff Legend

Comparing deliantra/server/server/pets.C (file contents):
Revision 1.12 by root, Sat Dec 9 16:11:09 2006 UTC vs.
Revision 1.19 by root, Wed Jan 3 20:32:13 2007 UTC