[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.24 by root, Tue Dec 26 08:55:00 2006 UTC

  */
 #include <global.h>
 #include <object.h>
 #include <living.h>
-#ifndef __CEXTRACT__
-# include <sproto.h>
+#include <sproto.h>
-#endif
 #include <spells.h>
 #include <sounds.h>
 /* this function checks to see if a spell pushes objects as well
  * as flies over and damages them (only used for cones for now)
     {
       weight_move = op->weight + (op->weight * op->level) / 3;
       /*LOG (llevDebug, "DEBUG: arch weighs %d and masses %d (%s,level %d)\n", op->weight,weight_move,op->name,op->level); */
     }
-  for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
+  for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
     {
       int num_sections = 1;
       /* don't move DM */
       if (QUERY_FLAG (tmp, FLAG_WIZ))
  * we remove the magic flag - that can be derived from
  * spob->attacktype.
  * This function sets up the appropriate owner and skill
  * pointers.
  */
 int
 fire_bolt (object *op, object *caster, int dir, object *spob, object *skill)
 {
   object *tmp = NULL;
   int mflags;
   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;
+  maptile *newmap;
-  mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y);
+  mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
   if (mflags & P_OUT_OF_MAP)
     {
       tmp->destroy ();
       return 0;
     }
+  tmp->map = newmap;
   if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
     {
       if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
         {
     }
   /* 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;
   /* If nothing alive on this space, no reason to do anything further */
   if (!(mflags & P_IS_ALIVE))
     return;
-  for (tmp = get_map_ob (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
+  for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
     {
       if (QUERY_FLAG (tmp, FLAG_ALIVE))
         {
           dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
           if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
             }
         }
     }
 }
 /* Basically, we move 'op' one square, and if it hits something,
  * call check_bullet.
  * This function is only applicable to bullets, but not to all
  * fired arches (eg, bolts).
  */
 void
 move_bullet (object *op)
 {
   sint16 new_x, new_y;
   int mflags;
     {
       op->direction = absdir (op->direction + 4);
       update_turn_face (op);
     }
   else
-    {
-      check_bullet (op);
+    check_bullet (op);
-    }
 }
   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;
+  maptile *newmap;
-  mflags = get_map_flags (tmp->map, &tmp->map, tmp->x, tmp->y, &tmp->x, &tmp->y);
+  mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
   if (mflags & P_OUT_OF_MAP)
     {
       tmp->destroy ();
       return 0;
     }
+  tmp->map = newmap;
   if (OB_TYPE_MOVE_BLOCK (tmp, GET_MAP_MOVE_BLOCK (tmp->map, tmp->x, tmp->y)))
     {
       if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
         {
       tmp->y = op->y;
       tmp->direction = absdir (tmp->direction + 4);
       tmp->map = op->map;
     }
-  if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)) != NULL)
+  if ((tmp = insert_ob_in_map (tmp, tmp->map, op, 0)))
     check_bullet (tmp);
   return 1;
 }
   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 no map then hit_map will crash so just ignore object */
   if (!op->map)
     {
       LOG (llevError, "Tried to move_cone object %s without a map.\n", op->name ? &op->name : "unknown");
-      op->speed = 0;
+      op->set_speed (0);
-      update_ob_speed (op);
       return;
     }
   /* lava saves it's life, but not yours  :) */
   if (QUERY_FLAG (op, FLAG_LIFESAVE))
 #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 (GET_MAP_MOVE_BLOCK (mp, x, y) & MOVE_FLY_LOW)
         return NULL;
       if (mflags & P_IS_ALIVE)
         {
-          for (target = get_map_ob (mp, x, y); target; target = target->above)
+          for (target = GET_MAP_OB (mp, x, y); target; target = target->above)
             {
               if (QUERY_FLAG (target->head ? target->head : target, FLAG_MONSTER))
                 {
                   return target;
                 }
   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);
     }
           mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
           if (mflags & P_OUT_OF_MAP)
             continue;
           if (mflags & P_IS_ALIVE)
             {
-              for (tmp = get_map_ob (m, sx, sy); tmp; tmp = tmp->above)
+              for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)
                 {
                   if (QUERY_FLAG (tmp, FLAG_ALIVE) || tmp->type == PLAYER)
                     break;
                 }
               if (tmp)
   force->stats.ac = spell_ob->stats.ac;
   force->stats.wc = spell_ob->stats.wc;
   change_abil (tmp, force);     /* Mostly to display any messages */
   insert_ob_in_ob (force, tmp);
-  fix_player (tmp);
+  tmp->update_stats ();
   return 1;
 }
         /* If there is nothing living on this space, no need to go further */
         if (!(mflags & P_IS_ALIVE))
           continue;
-        for (tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above)
+        for (tmp = GET_MAP_OB (m, nx, ny); tmp; tmp = tmp->above)
           if (QUERY_FLAG (tmp, FLAG_MONSTER))
             break;
         /* There can be living objects that are not monsters */
         if (!tmp || tmp->type == PLAYER)
             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);
       return 0;
     }
   if (mflags & P_IS_ALIVE && spell->attacktype)
     {
-      for (target = get_map_ob (m, x, y); target; target = target->above)
+      for (target = GET_MAP_OB (m, x, y); target; target = target->above)
         if (QUERY_FLAG (target, FLAG_MONSTER))
           {
             /* oky doky. got a target monster. Lets make a blinding attack */
             if (target->head)
               target = target->head;
       /* Only bother looking on this space if there is something living here */
       if (mflags & P_IS_ALIVE)
         {
           /* search this square for a victim */
-          for (walk = get_map_ob (m, x, y); walk; walk = walk->above)
+          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.24 by root, Tue Dec 26 08:55:00 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.24 by root, Tue Dec 26 08:55:00 2006 UTC