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

Comparing deliantra/server/server/pets.C (file contents):
Revision 1.28 by elmex, Mon Apr 16 11:50:45 2007 UTC vs.
Revision 1.38 by root, Sun Jul 1 05:00:20 2007 UTC

 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
- * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * This program is free software; you can redistribute it and/or modify
+ * Crossfire TRT is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 #include <global.h>
 #include <sproto.h>
   if (owner = pet->owner)
     {
       /* If the owner has turned on the pet, make the pet
        * unfriendly.
        */
-      if ((check_enemy (owner, rv)) == pet)
+      if (check_enemy (owner, rv) == pet)
         {
-          CLEAR_FLAG (pet, FLAG_FRIENDLY);
           remove_friendly_object (pet);
           pet->attack_movement &= ~PETMOVE;
           return owner;
         }
     }
   else
     {
       /* else the owner is no longer around, so the
        * pet no longer needs to be friendly.
        */
-      CLEAR_FLAG (pet, FLAG_FRIENDLY);
       remove_friendly_object (pet);
       pet->attack_movement &= ~PETMOVE;
       return 0;
     }
   /* If they are not on the same map, the pet won't be agressive */
   //if (!on_same_map (pet, owner))
   //  return 0;
   /* See if the pet has an existing enemy. If so, don't start a new one */
   /* Since the pet has no existing enemy, look for anything nasty
    * around the owner that it should go and attack. (if the owner is
    * still on a map)
    */
+  // owners sometimes are not on a map but in the inventory of somehting else
-  if (!owner->flag [FLAG_REMOVED])
+  if (!owner->flag [FLAG_REMOVED] && owner->map)
     {
       tmp3 = 0;
       for (i = 0; i < SIZEOFFREE; i++)
         {
 void
 terminate_all_pets (object *owner)
 {
   objectlink *obl, *next;
-  for (obl = first_friendly_object; obl != NULL; obl = next)
+  for (obl = first_friendly_object; obl; obl = next)
     {
       object *ob = obl->ob;
       next = obl->next;
       if (ob->owner == owner)
-        {
-          if (!QUERY_FLAG (ob, FLAG_REMOVED))
-            ob->remove ();
-          remove_friendly_object (ob);
-          ob->destroy ();
+        ob->destroy ();
-        }
     }
 }
 /*
  * Unfortunately, sometimes, the owner of a pet is in the
 int
 follow_owner (object *ob, object *owner)
 {
   if (owner->flag [FLAG_REMOVED])
     return 0; // do nothing if the owner is removed
-  else if (owner->map->in_memory != MAP_IN_MEMORY)
+  else if (!owner->map || owner->map->in_memory != MAP_IN_MEMORY)
-    LOG (llevError, "Owner of the pet not on a map in memory!?\n");
+    LOG (llevError, "owner '%s' of the pet '%s' not on a map in memory!?\n", &owner->name, &ob->name);
   else
     {
       int dir = find_free_spot (ob, owner->map, owner->x, owner->y, 1, SIZEOFFREE);
       if (dir >= 0)
   maptile *m;
   /* Check to see if player pulled out */
   if ((owner = ob->owner) == NULL)
     {
-      ob->remove ();           /* Will be freed when returning */
-      remove_friendly_object (ob);
       ob->destroy ();
       LOG (llevMonster, "Pet: no owner, leaving.\n");
       return;
     }
  * is_golem is to note that this is a golem spell.
  */
 object *
 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; atmp = atmp->more)
+  for (archetype *atmp = at; atmp; atmp = (archetype *)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 (is_golem)
         }
       if (!head)
         head = tmp;
-      tmp->x = op->x + freearr_x[dir] + tmp->arch->clone.x;
+      tmp->x = op->x + freearr_x[dir] + tmp->arch->x;
-      tmp->y = op->y + freearr_y[dir] + tmp->arch->clone.y;
+      tmp->y = op->y + freearr_y[dir] + tmp->arch->y;
       tmp->map = op->map;
       if (tmp->invisible)
         tmp->invisible = 0;
   object *tmp;
   if (QUERY_FLAG (op, FLAG_MONSTER))
     return;                     /* Has already been moved */
-  if (op->owner == NULL)
+  if (!op->owner)
     {
       LOG (llevDebug, "Golem without owner destructed.\n");
       op->remove ();
       op->destroy ();
       return;
   if (--op->stats.hp < 0)
     {
       if (op->msg)
         new_draw_info (NDI_UNIQUE, 0, op->owner, op->msg);
-      op->owner->contr->ranges[range_golem] = 0;
-      remove_friendly_object (op);
-      op->remove ();
       op->destroy ();
       return;
     }
   /* Do golem attacks/movement for single & multisq golems.
        * but since we are not trying to dereferance that pointer,
        * that isn't a problem.
        */
       if (victim && victim != op && victim->head != op)
         {
           /* for golems with race fields, we don't attack
            * aligned races
            */
           if (victim->race && op->race && strstr (op->race, victim->race))
   char buf[MAX_BUF];
   /* Because there can be different golem spells, player may want to
    * 'lose' their old golem.
    */
-  if (op->type == PLAYER && op->contr->ranges[range_golem])
+  if (op->type == PLAYER && op->contr->golem)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "You dismiss your existing golem.");
-      op->contr->ranges[range_golem]->remove ();
+      op->contr->golem->remove ();
-      op->contr->ranges[range_golem]->destroy ();
+      op->contr->golem->destroy ();
-      op->contr->ranges[range_golem] = 0;
+      op->contr->golem = 0;
     }
   if (spob->other_arch)
     at = spob->other_arch;
   else if (spob->race)
       LOG (llevError, "Spell %s lacks other_arch\n", &spob->name);
       return 0;
     }
   if (!dir)
-    dir = find_free_spot (&at->clone, op->map, op->x, op->y, 1, SIZEOFFREE1 + 1);
+    dir = find_free_spot (at, op->map, op->x, op->y, 1, SIZEOFFREE1 + 1);
-  if (dir < 0 || ob_blocked (&at->clone, op->map, op->x + freearr_x[dir], op->y + freearr_y[dir]))
+  if (dir < 0 || ob_blocked (at, 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;
     }
   if (op->type == PLAYER)
     {
       tmp->type = GOLEM;
       tmp->set_owner (op);
+      op->contr->golem = tmp;
+      /* give the player control of the golem */
       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))
         {
           if (level < tr->magic)
             break;
           lasttr = tr;
-          if (tr->item->name == sparam)
+          if (tr->item->archname == sparam)
             break;
         }
       if (!lasttr)
         {
       return 0;
     }
   for (i = 1; i <= nrof; i++)
     {
-      archetype *atmp;
       object *prev = NULL, *head = NULL, *tmp;
       if (dir)
         {
           ndir = dir;
           dir = absdir (dir + 1);
         }
       else
-        ndir = find_free_spot (&summon_arch->clone, op->map, op->x, op->y, 1, SIZEOFFREE);
+        ndir = find_free_spot (summon_arch, op->map, op->x, op->y, 1, SIZEOFFREE);
       if (ndir > 0)
         {
           x = freearr_x[ndir];
           y = freearr_y[ndir];
         }
-      if (ndir < 0 || ob_blocked (&summon_arch->clone, op->map, op->x + x, op->y + y))
+      if (ndir < 0 || ob_blocked (summon_arch, op->map, op->x + x, op->y + y))
         {
           new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
           if (nrof > 1)
             new_draw_info (NDI_UNIQUE, 0, op, "No more pets for this casting.");
           return nrof > 1;
         }
-      for (atmp = summon_arch; atmp != NULL; atmp = atmp->more)
+      for (archetype *atmp = summon_arch; atmp != NULL; atmp = (archetype *)atmp->more)
         {
           tmp = arch_to_object (atmp);
           if (atmp == summon_arch)
             {
               if (QUERY_FLAG (tmp, FLAG_MONSTER))
               tmp->head = head;
               prev->more = tmp;
             }
           prev = tmp;
-          tmp->x = op->x + x + tmp->arch->clone.x;
+          tmp->x = op->x + x + tmp->arch->x;
-          tmp->y = op->y + y + tmp->arch->clone.y;
+          tmp->y = op->y + y + tmp->arch->y;
           tmp->map = op->map;
         }
       head->direction = freedir[ndir];
       head->stats.exp = 0;
     return 0;
   /* get the owners of itself and the target, this is to deal with pets of
      pets */
   rowner = get_real_owner (owner);
-  if (target->type != PLAYER)
+  towner = target->type == PLAYER ? 0 : get_real_owner (target);
-    {
-      towner = get_real_owner (target);
-    }
-  else
-    {
-      towner = 0;
-    }
   /* if the pet has now owner, exit with error */
-  if (rowner == NULL)
+  if (!rowner)
     {
       LOG (llevError, "Pet has no owner.\n");
       return 0;
     }

Diff Legend

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

Comparing deliantra/server/server/pets.C (file contents): Revision 1.28 by elmex, Mon Apr 16 11:50:45 2007 UTC vs. Revision 1.38 by root, Sun Jul 1 05:00:20 2007 UTC

Diff Legend

Comparing deliantra/server/server/pets.C (file contents):
Revision 1.28 by elmex, Mon Apr 16 11:50:45 2007 UTC vs.
Revision 1.38 by root, Sun Jul 1 05:00:20 2007 UTC