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

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.21 by root, Tue Dec 19 05:41:22 2006 UTC vs.
Revision 1.25 by root, Sat Dec 23 09:58:23 2006 UTC

           new_draw_info (NDI_UNIQUE, 0, op, "Something blocks your magic.");
           return 0;
         }
       if (mflags & P_IS_ALIVE)
         {
-          for (tmp = get_map_ob (m, x, y); tmp != NULL; tmp = tmp->above)
+          for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
             if (QUERY_FLAG (tmp, FLAG_ALIVE) && (tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
               {
                 new_draw_info (NDI_UNIQUE, 0, op, "You detect something.");
                 if (tmp->head != NULL)
                   tmp = tmp->head;
         if (mflags & P_OUT_OF_MAP)
           continue;
         // earth to dust tears down everything that can be teared down
-        for (tmp = get_map_ob (m, sx, sy); tmp != NULL; tmp = next)
+        for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = next)
           {
             next = tmp->above;
             if (QUERY_FLAG (tmp, FLAG_TEAR_DOWN))
               hit_player (tmp, 9998, op, AT_PHYSICAL, 0);
           }
         }
       return cast_spell (op, caster, dir, newspell, NULL);
     }
   return 1;
 }
 int
 perceive_self (object *op)
 {
   char *cp = describe_item (op, op), buf[MAX_BUF];
   char portal_name[1024], portal_message[1024];
   sint16 exitx, exity;
   maptile *exitmap;
   int op_level;
   /* Check to see if the map the player is currently on is a per player unique
    * map.  This can be determined in that per player unique maps have the
    * full pathname listed.
    */
   if (!strncmp (op->map->path, settings.localdir, strlen (settings.localdir)) && settings.create_home_portals != TRUE)
   force->destroy ();
   return 1;
 }
 /* This creates magic walls.  Really, it can create most any object,
  * within some reason.
  */
 int
 magic_wall (object *op, object *caster, int dir, object *spell_ob)
 {
   object *tmp, *tmp2;
   int i, posblocked, negblocked, maxrange;
   else
     {
       x = op->x + freearr_x[dir];
       y = op->y + freearr_y[dir];
     }
   m = op->map;
   if ((spell_ob->move_block || x != op->x || y != op->y) &&
       (get_map_flags (m, &m, x, y, &x, &y) & (P_OUT_OF_MAP | P_IS_ALIVE) ||
        ((spell_ob->move_block & GET_MAP_MOVE_BLOCK (m, x, y)) == spell_ob->move_block)))
     {
       new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
       return 0;
     }
   if (spell_ob->other_arch)
-    {
-      tmp = arch_to_object (spell_ob->other_arch);
+    tmp = arch_to_object (spell_ob->other_arch);
-    }
   else if (spell_ob->race)
     {
       char buf1[MAX_BUF];
       sprintf (buf1, spell_ob->race, dir);
     }
   else if (QUERY_FLAG (tmp, FLAG_ALIVE))
     {
       tmp->stats.hp = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
       tmp->stats.maxhp = tmp->stats.hp;
-      tmp->set_owner (op);
-      set_spell_skill (op, caster, spell_ob, tmp);
     }
   if (QUERY_FLAG (spell_ob, FLAG_IS_USED_UP) || QUERY_FLAG (tmp, FLAG_IS_USED_UP))
     {
       tmp->stats.food = spell_ob->duration + SP_level_duration_adjust (caster, spell_ob);
       SET_FLAG (tmp, FLAG_IS_USED_UP);
     }
   if (QUERY_FLAG (spell_ob, FLAG_TEAR_DOWN))
     {
       tmp->stats.hp = spell_ob->stats.dam + SP_level_dam_adjust (caster, spell_ob);
       tmp->stats.maxhp = tmp->stats.hp;
       SET_FLAG (tmp, FLAG_TEAR_DOWN);
       SET_FLAG (tmp, FLAG_ALIVE);
     }
   /* This can't really hurt - if the object doesn't kill anything,
-   * these fields just won't be used.
+   * these fields just won't be used. Do not set the owner for
+   * earthwalls, though, so they survive restarts.
    */
+  if (tmp->type != EARTHWALL) //TODO
-  tmp->set_owner (op);
+    tmp->set_owner (op);
   set_spell_skill (op, caster, spell_ob, tmp);
   tmp->x = x;
   tmp->y = y;
   tmp->level = caster_level (caster, spell_ob) / 2;
   if ((tmp = insert_ob_in_map (tmp, m, op, 0)) == NULL)
     {
       new_draw_info_format (NDI_UNIQUE, 0, op, "Something destroys your %s", name);
       return 0;
     }
   /* If this is a spellcasting wall, need to insert the spell object */
   if (tmp->other_arch && tmp->other_arch->clone.type == SPELL)
     insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp);
   /*  This code causes the wall to extend some distance in
   force->stats.ac = spell_ob->stats.ac;
   force->attacktype = spell_ob->attacktype;
   insert_ob_in_ob (force, tmp);
   change_abil (tmp, force);     /* Mostly to display any messages */
-  fix_player (tmp);
+  tmp->update_stats ();
   return 1;
 }
 /* This used to be part of cast_change_ability, but it really didn't make
  * a lot of sense, since most of the values it derives are from the god
   force->stats.wc = spell_ob->stats.wc;
   force->stats.ac = spell_ob->stats.ac;
   change_abil (tmp, force);     /* Mostly to display any messages */
   insert_ob_in_ob (force, tmp);
-  fix_player (tmp);
+  tmp->update_stats ();
   return 1;
 }
             continue;
           small_nuggets = 0;
           large_nuggets = 0;
-          for (tmp = get_map_ob (mp, nx, ny); tmp != NULL; tmp = next)
+          for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = next)
             {
               next = tmp->above;
               if (tmp->weight > 0 && !QUERY_FLAG (tmp, FLAG_NO_PICK) &&
                   !QUERY_FLAG (tmp, FLAG_ALIVE) && !QUERY_FLAG (tmp, FLAG_IS_CAULDRON))
                 {
   large->destroy ();
   small->destroy ();
   /* reset this so that if player standing on a big pile of stuff,
    * it is redrawn properly.
    */
-  op->contr->socket->look_position = 0;
+  op->contr->ns->look_position = 0;
   return 1;
 }
 /* This function removes the cursed/damned status on equipped
    * stuff on the floor.  Only identify stuff on the floor if the spell
    * was not fully used.
    */
   if (num_ident)
     {
-      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_IDENTIFIED) && !tmp->invisible && need_identify (tmp))
           {
             identify (tmp);
             if (op->type == PLAYER)
          * floor.  But this is not true for show invisible.
          * Basically, we just go and find the top object and work
          * down - that is easier than working up.
          */
-        for (last = NULL, tmp = get_map_ob (m, nx, ny); tmp; tmp = tmp->above)
+        for (last = NULL, tmp = GET_MAP_OB (m, nx, ny); tmp; tmp = tmp->above)
           last = tmp;
         /* Shouldn't happen, but if there are no objects on a space, this
          * would happen.
          */
   mflags = get_map_flags (m, &m, x, y, &x, &y);
   if (!(mflags & P_OUT_OF_MAP) && mflags & P_IS_ALIVE)
     {
-      for (plyr = get_map_ob (m, x, y); plyr != NULL; plyr = plyr->above)
+      for (plyr = GET_MAP_OB (m, x, y); plyr != NULL; plyr = plyr->above)
         if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE))
           break;
     }
   /* If we did not find a player in the specified direction, transfer
    * to anyone on top of us. This is used for the rune of transference mostly.
    */
   if (plyr == NULL)
-    for (plyr = get_map_ob (op->map, op->x, op->y); plyr != NULL; plyr = plyr->above)
+    for (plyr = GET_MAP_OB (op->map, op->x, op->y); plyr != NULL; plyr = plyr->above)
       if (plyr != op && QUERY_FLAG (plyr, FLAG_ALIVE))
         break;
   if (!plyr)
     {
   m = op->map;
   mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
   if (mflags & P_OUT_OF_MAP)
     return;
-  for (tmp = get_map_ob (m, sx, sy); tmp != NULL; tmp = next)
+  for (tmp = GET_MAP_OB (m, sx, sy); tmp != NULL; tmp = next)
     {
       next = tmp->above;
       /* Need to look at the head object - otherwise, if tmp
        * points to a monster, we don't have all the necessary
    * so instead, just set it as equipped (otherwise, we need to update
    * body_info, skills, etc)
    */
   SET_FLAG (tmp, FLAG_USE_WEAPON);
   SET_FLAG (weapon, FLAG_APPLIED);
-  fix_player (tmp);
+  tmp->update_stats ();
   /* There used to be 'odd' code that basically seemed to take the absolute
    * value of the weapon->magic an use that.  IMO, that doesn't make sense -
    * if you're using a crappy weapon, it shouldn't be as good.
    */
 void
 move_peacemaker (object *op)
 {
   object *tmp;
-  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 atk_lev, def_lev;
       object *victim = tmp;
       if (tmp->head)

Diff Legend

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

Comparing deliantra/server/server/spell_effect.C (file contents): Revision 1.21 by root, Tue Dec 19 05:41:22 2006 UTC vs. Revision 1.25 by root, Sat Dec 23 09:58:23 2006 UTC

Diff Legend

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.21 by root, Tue Dec 19 05:41:22 2006 UTC vs.
Revision 1.25 by root, Sat Dec 23 09:58:23 2006 UTC