[ViewVC] Diff of: cvs/deliantra/server/server/spell

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.18 by root, Wed Dec 13 00:42:04 2006 UTC vs.
Revision 1.20 by root, Mon Dec 18 02:35:01 2006 UTC

   tmp->direction = dir;
   if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
     SET_ANIMATION (tmp, dir);
-  set_owner (tmp, op);
+  tmp->set_owner (op);
   set_spell_skill (op, caster, spob, tmp);
   tmp->x = op->x + DIRX (tmp);
   tmp->y = op->y + DIRY (tmp);
   tmp->map = op->map;
     }
   /* other_arch contains what this explodes into */
   tmp = arch_to_object (op->other_arch);
-  copy_owner (tmp, op);
+  tmp->set_owner (op);
   tmp->skill = op->skill;
-  owner = get_owner (op);
+  owner = op->owner;
   if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner))
     {
       op->destroy ();
       return;
   tmp->direction = dir;
   if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
     SET_ANIMATION (tmp, dir);
-  set_owner (tmp, op);
+  tmp->set_owner (op);
   set_spell_skill (op, caster, spob, tmp);
   tmp->x = op->x + freearr_x[dir];
   tmp->y = op->y + freearr_y[dir];
   tmp->map = op->map;
   object *new_ob = arch_to_object (op->other_arch);
   new_ob->x = op->x;
   new_ob->y = op->y;
   new_ob->level = op->level;
-  set_owner (new_ob, op->owner);
+  new_ob->set_owner (op->owner);
   /* preserve skill ownership */
   if (op->skill && op->skill != new_ob->skill)
     {
       new_ob->skill = op->skill;
 #if 0
   /* Disable this - enabling it makes monsters easier, as
    * when their cone dies when they die.
    */
   /* If no owner left, the spell dies out. */
-  if (get_owner (op) == NULL)
+  if (op->owner == NULL)
     {
       op->destroy ();
       return;
     }
 #endif
       if ((movetype & GET_MAP_MOVE_BLOCK (m, sx, sy)) == movetype)
         continue;
       success = 1;
       tmp = arch_to_object (spell->other_arch);
-      set_owner (tmp, op);
+      tmp->set_owner (op);
       set_spell_skill (op, caster, spell, tmp);
       tmp->level = caster_level (caster, spell);
       tmp->x = sx;
       tmp->y = sy;
       tmp->attacktype = spell->attacktype;
           tmp->direction = i;
           tmp->range = op->range;
           tmp->stats.dam = op->stats.dam;
           tmp->duration = op->duration;
           tmp->attacktype = op->attacktype;
-          copy_owner (tmp, op);
+          tmp->set_owner (op);
           if (op->skill && op->skill != tmp->skill)
             {
               tmp->skill = op->skill;
             }
           if (QUERY_FLAG (tmp, FLAG_IS_TURNABLE))
   tmp->range = spell->range + SP_level_range_adjust (caster, spell);
   tmp->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
   tmp->duration = spell->duration + SP_level_duration_adjust (caster, spell);
   tmp->attacktype = spell->attacktype;
-  set_owner (tmp, op);
+  tmp->set_owner (op);
   set_spell_skill (op, caster, spell, tmp);
   tmp->x = dx;
   tmp->y = dy;
   insert_ob_in_map (tmp, m, op, 0);
   return 1;
   if (effect->attacktype & AT_DEATH)
     {
       effect->level = spell->stats.dam + SP_level_dam_adjust (caster, spell);
       /* casting death spells at undead isn't a good thing */
-      if QUERY_FLAG
-        (target, FLAG_UNDEAD)
+      if (QUERY_FLAG (target, FLAG_UNDEAD))
         {
           if (random_roll (0, 2, op, PREFER_LOW))
             {
               new_draw_info (NDI_UNIQUE, 0, op, "Idiot! Your spell boomerangs!");
               effect->x = op->x;
     {
       /* how much woe to inflict :) */
       effect->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
     }
-  set_owner (effect, op);
+  effect->set_owner (op);
   set_spell_skill (op, caster, spell, effect);
   /* ok, tell it where to be, and insert! */
   effect->x = target->x;
   effect->y = target->y;
     {
       op->destroy ();
       return;
     }
-  owner = get_owner (op);
+  owner = op->owner;
 #if 0
   /* It'd make things nastier if this wasn't here - spells cast by
    * monster that are then killed would continue to survive
    */
   if (owner == NULL)
     }
   op->x = new_x;
   op->y = new_y;
   op->map = m;
-  i = spell_find_dir (op->map, op->x, op->y, get_owner (op));
+  i = spell_find_dir (op->map, op->x, op->y, op->owner);
   if (i > 0 && i != op->direction)
     {
       op->direction = i;
       SET_ANIMATION (op, op->direction);
     }
             SET_FLAG (head, FLAG_FRIENDLY);
             /* Prevent uncontolled outbreaks of self replicating monsters.
                Typical use case is charm, go somwhere, use aggravation to make hostile.
                This could lead to fun stuff like mice outbreak in bigworld and server crawl. */
             CLEAR_FLAG (head, FLAG_GENERATOR);
-            set_owner (head, op);
+            head->set_owner (op);
             set_spell_skill (op, caster, spell, head);
             add_friendly_object (head);
             head->attack_movement = PETMOVE;
             done_one = 1;
             change_exp (op, head->stats.exp / 2, head->skill, SK_EXP_ADD_SKILL);
   int i, j, dam_save, dir, mflags;
   sint16 nx, ny, hx, hy;
   object *owner;
   maptile *m;
-  owner = get_owner (op);
+  owner = op->owner;
   /* the following logic makes sure that the ball doesn't move into a wall,
    * and makes sure that it will move along a wall to try and get at it's
    * victim.  The block immediately below more or less chooses a random
    * offset to move the ball, eg, keep it mostly on course, with some
     }
   /* restore to the center location and damage */
   op->stats.dam = dam_save;
-  i = spell_find_dir (op->map, op->x, op->y, get_owner (op));
+  i = spell_find_dir (op->map, op->x, op->y, op->owner);
   if (i >= 0)
     {                           /* we have a preferred direction!  */
       /* pick another direction if the preferred dir is blocked. */
       if (get_map_flags (op->map, &m, nx + freearr_x[i], ny + freearr_y[i], &hx, &hy) & P_OUT_OF_MAP ||
   maptile *m;
 #endif
   int basedir;
   object *owner;
-  owner = get_owner (op);
+  owner = op->owner;
   if (op->duration == 0 || owner == NULL)
     {
       op->destroy ();
       return;
     }
     return 0;
   tmp = get_archetype (SWARM_SPELL);
   tmp->x = op->x;
   tmp->y = op->y;
-  set_owner (tmp, op);          /* needed so that if swarm elements kill, caster gets xp. */
+  tmp->set_owner (op);          /* needed so that if swarm elements kill, caster gets xp. */
   set_spell_skill (op, caster, spell, tmp);
   tmp->level = caster_level (caster, spell);    /*needed later, to get level dep. right. */
   tmp->spell = arch_to_object (spell->other_arch);
           for (walk = get_map_ob (m, x, y); walk; walk = walk->above)
             if (QUERY_FLAG (walk, FLAG_MONSTER) || (walk->type == PLAYER))
               {                 /* found a victim */
                 object *disease = arch_to_object (spell->other_arch);
-                set_owner (disease, op);
+                disease->set_owner (op);
                 set_spell_skill (op, caster, spell, disease);
                 disease->stats.exp = 0;
                 disease->level = caster_level (caster, spell);
                 /* do level adjustments */

Diff Legend

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

Comparing deliantra/server/server/spell_attack.C (file contents): Revision 1.18 by root, Wed Dec 13 00:42:04 2006 UTC vs. Revision 1.20 by root, Mon Dec 18 02:35:01 2006 UTC

Diff Legend

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.18 by root, Wed Dec 13 00:42:04 2006 UTC vs.
Revision 1.20 by root, Mon Dec 18 02:35:01 2006 UTC