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

Comparing deliantra/server/server/pets.C (file contents):
Revision 1.17 by root, Tue Dec 26 08:55:00 2006 UTC vs.
Revision 1.19 by root, Wed Jan 3 20:32:13 2007 UTC

          */
         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)
             {
               object *tmp2 = tmp->head == NULL ? tmp : tmp->head;
  * 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;
 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);
           tmp->set_owner (op);
           if (op->type == PLAYER)
             {
               tmp->stats.exp = 0;
               add_friendly_object (tmp);
             {
               if (QUERY_FLAG (op, FLAG_FRIENDLY))
                 {
                   object *owner = op->owner;
-                  if (owner != NULL)
+                  if (owner)
                     {           /* For now, we transfer ownership */
                       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 (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 (QUERY_FLAG (op, FLAG_FRIENDLY))
         {
           object *owner = op->owner;
-          if (owner != NULL)
+          if (owner)
             {                   /* For now, we transfer ownership */
               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;
       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;
 }

Diff Legend

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

Comparing deliantra/server/server/pets.C (file contents): Revision 1.17 by root, Tue Dec 26 08:55:00 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.17 by root, Tue Dec 26 08:55:00 2006 UTC vs.
Revision 1.19 by root, Wed Jan 3 20:32:13 2007 UTC