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

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.115 by root, Sun Nov 29 09:41:28 2009 UTC vs.
Revision 1.118 by root, Sun Feb 7 04:22:33 2010 UTC

       new_draw_info (NDI_UNIQUE, 0, op, "You don't have enough experience to create any food.");
       return 0;
     }
   food_value /= at->stats.food;
-  new_op = arch_to_object (at);
+  new_op = at->instance ();
   new_op->nrof = food_value;
   new_op->value = 0;
   if (new_op->nrof < 1)
     new_op->nrof = 1;
         for (int i = 0; i < NUM_STATS; i++)
           if (tmp->stats.stat (i) < 0)
             buf.printf (" - Your %s is depleted by %d.\n", statname[i], -tmp->stats.stat (i));
     }
-  if (is_dragon_pl (op))
+  if (op->is_dragon ())
     /* now grab the 'dragon_ability'-force from the player's inventory */
     for (tmp = op->inv; tmp; tmp = tmp->below)
       {
         if (tmp->type == FORCE && tmp->arch->archname == shstr_dragon_ability_force)
           {
       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 = spell_ob->other_arch->instance ();
   else if (spell_ob->race)
     {
       char buf1[MAX_BUF];
       sprintf (buf1, spell_ob->race, dir);
           LOG (llevError, "summon_wall: Unable to find archetype %s\n", buf1);
           new_draw_info (NDI_UNIQUE, 0, op, "This spell is broken.");
           return 0;
         }
-      tmp = arch_to_object (at);
+      tmp = at->instance ();
     }
   else
     {
       LOG (llevError, "magic_wall: spell %s lacks other_arch\n", &spell_ob->name);
       return 0;
       return 0;
     }
   /* If this is a spellcasting wall, need to insert the spell object */
   if (tmp->other_arch && tmp->other_arch->type == SPELL)
-    insert_ob_in_ob (arch_to_object (tmp->other_arch), tmp);
+    insert_ob_in_ob (tmp->other_arch->instance (), tmp);
   /*  This code causes the wall to extend some distance in
    * each direction, or until an obstruction is encountered.
    * posblocked and negblocked help determine how far the
    * created wall can extend, it won't go extend through
           object *tmp2 = tmp->clone ();
           m->insert (tmp2, x, y, op);
           /* If this is a spellcasting wall, need to insert the spell object */
           if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
-            tmp2->insert (arch_to_object (tmp2->other_arch));
+            tmp2->insert (tmp2->other_arch->instance ());
         }
       else
         posblocked = 1;
         {
           object *tmp2 = tmp->clone ();
           m->insert (tmp2, x, y, op);
           if (tmp2->other_arch && tmp2->other_arch->type == SPELL)
-            tmp2->insert (arch_to_object (tmp2->other_arch));
+            tmp2->insert (tmp2->other_arch->instance ());
         }
       else
         negblocked = 1;
     }
           for (int i = 0; i < sizeof (nugget) / sizeof (nugget [0]); ++i)
             if (int nrof = value / nugget [i]->value)
               {
                 value -= nrof * nugget[i]->value;
-                object *tmp = arch_to_object (nugget[i]);
+                object *tmp = nugget[i]->instance ();
                 tmp->nrof = nrof;
                 tmp->flag [FLAG_IDENTIFIED] = true;
                 op->map->insert (tmp, x, y, op, 0);
               }
   range = spell->range + SP_level_range_adjust (caster, spell);
   if (!skill)
     skill = caster;
+  dynbuf buf;
-  unordered_mapwalk (op, -range, -range, range, range)
+  unordered_mapwalk (buf, op, -range, -range, range, range)
     {
       /* For most of the detections, we only detect objects above the
        * 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.
       /* Code here puts an effect of the spell on the space, so you can see
        * where the magic is.
        */
       if (done_one)
         {
-          object *detect_ob = arch_to_object (spell->other_arch);
+          object *detect_ob = spell->other_arch->instance ();
           /* if this is set, we want to copy the face */
           if (done_one == 2 && detect)
             {
               detect_ob->face = detect->face;
     }
   weapon = weapon->split ();
   /* create the golem object */
-  tmp = arch_to_object (spell->other_arch);
+  tmp = spell->other_arch->instance ();
   /* if animated by a player, give the player control of the golem */
   CLEAR_FLAG (tmp, FLAG_MONSTER);
   tmp->stats.exp = 0;
   add_friendly_object (tmp);
   new_aura = present_arch_in_ob (spell->other_arch, op);
   if (new_aura)
     refresh = 1;
   else
-    new_aura = arch_to_object (spell->other_arch);
+    new_aura = spell->other_arch->instance ();
   new_aura->duration = spell->duration + 10 * SP_level_duration_adjust (caster, spell);
   new_aura->stats.dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
       if (pos.normalise () && !(OB_TYPE_MOVE_BLOCK (env, pos->move_block)))
         {
           hit_map (aura, i, aura->attacktype, 0);
           if (aura->other_arch)
-            pos.insert (arch_to_object (aura->other_arch), aura);
+            pos.insert (aura->other_arch->instance (), aura);
         }
     }
   /* put the aura back in the player's inventory */
   env->insert (aura);
     }
   if (!spell->other_arch)
     return 0;
-  object *tmp = arch_to_object (spell->other_arch);
+  object *tmp = spell->other_arch->instance ();
   tmp->race = op->name;         /*Save the owner of the rune */
   tmp->msg = msg;
   tmp->insert_at (op, op, INS_BELOW_ORIGINATOR);

Diff Legend

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

Comparing deliantra/server/server/spell_effect.C (file contents): Revision 1.115 by root, Sun Nov 29 09:41:28 2009 UTC vs. Revision 1.118 by root, Sun Feb 7 04:22:33 2010 UTC

Diff Legend

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.115 by root, Sun Nov 29 09:41:28 2009 UTC vs.
Revision 1.118 by root, Sun Feb 7 04:22:33 2010 UTC