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

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.66 by root, Fri Aug 10 01:47:53 2007 UTC vs.
Revision 1.72 by root, Fri Aug 31 00:20:41 2007 UTC

  * pl is invisible.
  */
 int
 makes_invisible_to (object *pl, object *mon)
 {
   if (!pl->invisible)
     return 0;
   if (pl->type == PLAYER)
     {
       /* If race isn't set, then invisible unless it is undead */
       if (!pl->contr->invis_race)
         {
           if (QUERY_FLAG (mon, FLAG_UNDEAD))
             return 0;
           return 1;
         }
       /* invis_race is set if we get here */
       if (!strcmp (pl->contr->invis_race, "undead") && is_true_undead (mon))
         return 1;
       /* No race, can't be invisible to it */
       if (!mon->race)
         return 0;
       if (strstr (mon->race, pl->contr->invis_race))
         return 1;
       /* Nothing matched above, return 0 */
       return 0;
     }
   else
     {
   if (is_dragon_pl (op))
     /* now grab the 'dragon_ability'-force from the player's inventory */
     for (tmp = op->inv; tmp; tmp = tmp->below)
       {
-        if (tmp->type == FORCE && !strcmp (tmp->arch->archname, "dragon_ability_force"))
+        if (tmp->type == FORCE && tmp->arch->archname == shstr_dragon_ability_force)
           {
             if (tmp->stats.exp == 0)
               buf << "Your metabolism isn't focused on anything.\n";
             else
               buf << "Your metabolism is focused on " << change_resist_msg[tmp->stats.exp] << ".\n";
   op->speed_left = -FABS (op->speed) * 5;       /* Freeze them for a short while */
   return 1;
 }
 /* cast_heal: Heals something.
  * op is the caster.
  * dir is the direction he is casting it in.
  * spell is the spell object.
  */
         {
           /* See how many points we actually heal.  Instead of messages
            * based on type of spell, we instead do messages based
            * on amount of damage healed.
            */
-          if (heal > (tmp->stats.maxhp - tmp->stats.hp))
+          if (heal > tmp->stats.maxhp - tmp->stats.hp)
             heal = tmp->stats.maxhp - tmp->stats.hp;
           tmp->stats.hp += heal;
           if (tmp->stats.hp >= tmp->stats.maxhp)
             new_draw_info (NDI_UNIQUE, 0, tmp, "You feel just fine!");
           else if (heal > 50)
           success = 1;
         }
     }
   if (spell->attacktype & AT_DISEASE)
-    if (cure_disease (tmp, op))
+    if (cure_disease (tmp, op, spell))
       success = 1;
   if (spell->attacktype & AT_POISON)
     {
       at = archetype::find ("poisoning");
     }
   if (spell->stats.food && tmp->stats.food < 999)
     {
       tmp->stats.food += spell->stats.food;
       if (tmp->stats.food > 999)
         tmp->stats.food = 999;
       success = 1;
       /* We could do something a bit better like the messages for healing above */
       new_draw_info (NDI_UNIQUE, 0, tmp, "You feel your belly fill with food");
     }
                 value -= nrof * nugget[i]->value;
                 object *tmp = arch_to_object (nugget[i]);
                 tmp->nrof = nrof;
                 tmp->flag [FLAG_IDENTIFIED] = true;
-                caster->map->insert (tmp, x, y, caster, 0);
+                op->map->insert (tmp, x, y, op, 0);
               }
           if (weight > weight_max)
             goto bailout;
         }
         new_draw_info (NDI_UNIQUE, 0, op, "It can be no darker here.");
     }
   return success;
 }
 /* create an aura spell object and put it in the player's inventory.
  * as usual, op is player, caster is the object casting the spell,
  * spell is the spell object itself.
  */
 int
   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);
-  new_aura->set_owner (op);
   set_spell_skill (op, caster, spell, new_aura);
   new_aura->attacktype = spell->attacktype;
   new_aura->level = caster_level (caster, spell);
   if (refresh)
     new_draw_info (NDI_UNIQUE, 0, op, "You recast the spell while in effect.");
   else
     new_draw_info (NDI_UNIQUE, 0, op, "You create an aura of magical force.");
   insert_ob_in_ob (new_aura, op);
+  new_aura->set_owner (op);
   return 1;
 }
 /* move aura function.  An aura is a part of someone's inventory,
  * which he carries with him, but which acts on the map immediately
  * around him.
  * Aura parameters:
  * duration:  duration counter.
  * attacktype:  aura's attacktype
  * other_arch:  archetype to drop where we attack
  */
 void
 move_aura (object *aura)
 {
-  int i, mflags;
-  object *env;
-  maptile *m;
   /* auras belong in inventories */
-  env = aura->env;
+  object *env   = aura->env;
+  object *owner = aura->owner;
   /* no matter what we've gotta remove the aura...
    * we'll put it back if its time isn't up.
    */
   aura->remove ();
       aura->destroy ();
       return;
     }
   /* auras only exist in inventories */
-  if (env == NULL || env->map == NULL)
+  if (!env || !env->map)
     {
       aura->destroy ();
       return;
     }
   /* we need to jump out of the inventory for a bit
    * in order to hit the map conveniently.
    */
   aura->insert_at (env, aura);
-  for (i = 1; i < 9; i++)
+  for (int i = 1; i < 9; i++)
     {
-      sint16 nx, ny;
+      mapxy pos (env);
+      pos.move (i);
-      nx = aura->x + freearr_x[i];
-      ny = aura->y + freearr_y[i];
-      mflags = get_map_flags (env->map, &m, nx, ny, &nx, &ny);
-      /* Consider the movement tyep of the person with the aura as
+      /* Consider the movement type of the person with the aura as
-       * movement type of the aura.  Eg, if the player is flying, the aura
+       * movement type of the aura. Eg, if the player is flying, the aura
        * is flying also, if player is walking, it is on the ground, etc.
        */
-      if (!(mflags & P_OUT_OF_MAP) && !(OB_TYPE_MOVE_BLOCK (env, GET_MAP_MOVE_BLOCK (m, nx, ny))))
+      if (pos.normalise () && !(OB_TYPE_MOVE_BLOCK (env, pos->move_block)))
         {
           hit_map (aura, i, aura->attacktype, 0);
           if (aura->other_arch)
-            m->insert (arch_to_object (aura->other_arch), nx, ny, aura);
+            pos.insert (arch_to_object (aura->other_arch), aura);
         }
     }
   /* put the aura back in the player's inventory */
-  aura->remove ();
+  env->insert (aura);
-  insert_ob_in_ob (aura, env);
+  aura->set_owner (owner);
 }
 /* moves the peacemaker spell.
  * op is the piece object.
  */
 void
 move_peacemaker (object *op)
 {
   object *tmp;

Diff Legend

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

Comparing deliantra/server/server/spell_effect.C (file contents): Revision 1.66 by root, Fri Aug 10 01:47:53 2007 UTC vs. Revision 1.72 by root, Fri Aug 31 00:20:41 2007 UTC

Diff Legend

Comparing deliantra/server/server/spell_effect.C (file contents):
Revision 1.66 by root, Fri Aug 10 01:47:53 2007 UTC vs.
Revision 1.72 by root, Fri Aug 31 00:20:41 2007 UTC