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

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.62 by root, Mon Jul 14 00:04:57 2008 UTC vs.
Revision 1.73 by root, Sun Dec 28 06:59:27 2008 UTC

   sint16 x, y;
   maptile *m;
   if (--op->duration < 0)
     {
-      op->destroy ();
+      op->drop_and_destroy ();
       return;
     }
   hit_map (op, 0, op->attacktype, 1);
   maptile *newmap;
   mflags = get_map_flags (tmp->map, &newmap, tmp->x, tmp->y, &tmp->x, &tmp->y);
   if (mflags & P_OUT_OF_MAP)
     {
-      tmp->destroy ();
+      tmp->drop_and_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->destroy ();
+          tmp->drop_and_destroy ();
           return 0;
         }
       tmp->x = op->x;
       tmp->y = op->y;
 void
 explode_bullet (object *op)
 {
   object *tmp, *owner;
-  if (op->other_arch == NULL)
+  if (!op->other_arch)
     {
       LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
       op->destroy ();
       return;
     }
   tmp->set_owner (op);
   tmp->skill = op->skill;
   owner = op->owner;
-  if ((tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER) && owner && !tailor_god_spell (tmp, owner))
+  if ((tmp->attacktype & AT_HOLYWORD
+       || tmp->attacktype & AT_GODPOWER)
+      && owner
+      && !tailor_god_spell (tmp, owner))
     {
       op->destroy ();
       return;
     }
     {
       if (QUERY_FLAG (tmp, FLAG_ALIVE))
         {
           dam = hit_player (tmp, op->stats.dam, op, op->attacktype, 1);
+          // TODO: can't understand the following if's
           if (op->destroyed () || !tmp->destroyed () || (op->stats.dam -= dam) < 0)
             {
               if (!QUERY_FLAG (op, FLAG_REMOVED))
                 {
                   op->destroy ();
     }
 #endif
   hit_map (op, 0, op->attacktype, 0);
+  if (!op->is_on_map ())
+    return;
   /* Check to see if we should push anything.
    * Spell objects with weight push whatever they encounter to some
    * degree.
    */
   if (op->weight)
+    {
-    check_spell_knockback (op);
+      check_spell_knockback (op);
-  if (op->destroyed ())
+      if (!op->is_on_map ())
-    return;
+        return;
+    }
   if (op->duration-- < 0)
     {
       op->destroy ();
       return;
       success = 1;
       tmp = arch_to_object (spell->other_arch);
       tmp->set_owner (op);
       set_spell_skill (op, caster, spell, tmp);
-      tmp->level = caster_level (caster, spell);
+      tmp->level = casting_level (caster, spell);
       tmp->attacktype = spell->attacktype;
       /* holy word stuff */
       if ((tmp->attacktype & AT_HOLYWORD) || (tmp->attacktype & AT_GODPOWER))
         if (!tailor_god_spell (tmp, op))
   int mflags;
   sint16 dx = op->x + freearr_x[dir], dy = op->y + freearr_y[dir];
   maptile *m;
   mflags = get_map_flags (op->map, &m, dx, dy, &dx, &dy);
+  // when creating a bomb below ourself it should always work, even
+  // when movement is blocked (somehow we got here, somehow we are here,
+  // so we should also be able to make a bomb here). (originally added
+  // to fix create bomb traps in doors, which cast with dir=0).
+  if (dir)
+    {
-  if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
+      if ((mflags & P_OUT_OF_MAP) || (GET_MAP_MOVE_BLOCK (m, dx, dy) & MOVE_WALK))
-    {
+        {
-      new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
+          new_draw_info (NDI_UNIQUE, 0, op, "There is something in the way.");
-      return 0;
+          return 0;
+        }
     }
   tmp = arch_to_object (spell->other_arch);
   /*  level dependencies for bomb  */
     effect = arch_to_object (spell->other_arch);
   else
     return 0;
   /* tailor the effect by priest level and worshipped God */
-  effect->level = caster_level (caster, spell);
+  effect->level = casting_level (caster, spell);
   effect->attacktype = spell->attacktype;
   if (effect->attacktype & (AT_HOLYWORD | AT_GODPOWER))
     {
       if (tailor_god_spell (effect, op))
         new_draw_info_format (NDI_UNIQUE, 0, op, "%s answers your call!", determine_god (op));
 void
 move_missile (object *op)
 {
   if (op->range-- <= 0)
     {
-      op->destroy ();
+      op->drop_and_destroy ();
       return;
     }
   mapxy pos (op);
   pos.move (op->direction);
   object *tmp = get_archetype (FORCE_NAME);
   tmp->speed = 0.01;
   tmp->stats.food = time;
   SET_FLAG (tmp, FLAG_IS_USED_UP);
-  tmp->glow_radius = radius;
-  if (tmp->glow_radius > MAX_LIGHT_RADII)
-    tmp->glow_radius = MAX_LIGHT_RADII;
+  tmp->glow_radius = min (MAX_LIGHT_RADIUS, radius);
   tmp = insert_ob_in_ob (tmp, op);
   if (tmp->glow_radius > op->glow_radius)
     op->glow_radius = tmp->glow_radius;
   /* We precompute some values here so that we don't have to keep
    * doing it over and over again.
    */
   god = find_god (determine_god (op));
-  level = caster_level (caster, spell);
+  level = casting_level (caster, spell);
   range = spell->range + SP_level_range_adjust (caster, spell);
   /* On the bright side, no monster should ever have a race of GOD_...
    * so even if the player doesn't worship a god, if race=GOD_.., it
    * won't ever match anything.
         /* If there is nothing living on this space, no need to go further */
         if (!(mflags & P_IS_ALIVE))
           continue;
         // players can only affect spaces that they can actually see
+        if (caster
-        if (caster && caster->contr
+            && caster->contr
-            && caster->contr->visibility_at (m, nx, ny) < 70)
+            && caster->contr->darkness_at (m, nx, ny) == LOS_BLOCKED)
           continue;
         for (tmp = GET_MAP_TOP (m, nx, ny); tmp; tmp = tmp->below)
           if (QUERY_FLAG (tmp, FLAG_MONSTER))
             break;
       }                         /* for y */
   return 1;
 }
 /* Move_ball_spell: This handles ball type spells that just sort of wander
  * about.  was called move_ball_lightning, but since more than the ball
  * lightning spell used it, that seemed misnamed.
  * op is the spell effect.
  * note that duration is handled by process_object() in time.c
   for (i = 1; i < 9; i++)
     {
       /* i bit 0: alters sign of offset
        * other bits (i / 2): absolute value of offset
        */
       int offset = ((i ^ j) & 1) ? (i / 2) : -(i / 2);
       int tmpdir = absdir (op->direction + offset);
       nx = op->x + freearr_x[tmpdir];
       ny = op->y + freearr_y[tmpdir];
         {
           dir = tmpdir;
           break;
         }
     }
   if (dir == 0)
     {
       nx = op->x;
       ny = op->y;
       m = op->map;
       return;
     }
   if (!op->duration || !owner->is_on_map ())
     {
-      op->destroy ();
+      op->drop_and_destroy ();
       return;
     }
   op->duration--;
     return 0;
   object *tmp = archetype::get (SWARM_SPELL);
   set_spell_skill (op, caster, spell, tmp);
-  tmp->level      = caster_level (caster, spell);    /* needed later, to get level dep. right. */
+  tmp->level      = casting_level (caster, spell);    /* needed later, to get level dep. right. */
   tmp->spell      = spell->other_arch->instance ();
   tmp->attacktype = tmp->spell->attacktype;
   if (tmp->attacktype & AT_HOLYWORD || tmp->attacktype & AT_GODPOWER)
     if (!tailor_god_spell (tmp, op))
   int dam, mflags;
   maptile *m;
   dam = spell->stats.dam + SP_level_dam_adjust (caster, spell);
-  if (!dir)
+  if (dir)
-    {
-      new_draw_info (NDI_UNIQUE, 0, op, "In what direction?");
-      return 0;
-    }
+    {
-  x = op->x + freearr_x[dir];
+      x = op->x + freearr_x[dir];
-  y = op->y + freearr_y[dir];
+      y = op->y + freearr_y[dir];
-  m = op->map;
+      m = op->map;
-  mflags = get_map_flags (m, &m, x, y, &x, &y);
+      mflags = get_map_flags (m, &m, x, y, &x, &y);
-  if (mflags & P_OUT_OF_MAP)
+      if (mflags & P_OUT_OF_MAP)
-    {
+        {
-      new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there.");
+          new_draw_info (NDI_UNIQUE, 0, op, "Nothing is there.");
-      return 0;
+          return 0;
-    }
+        }
-  if (mflags & P_IS_ALIVE && spell->attacktype)
+      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))
+            if (QUERY_FLAG (target, FLAG_MONSTER))
-          {
+              {
-            /* oky doky. got a target monster. Lets make a blinding attack */
+                /* oky doky. got a target monster. Lets make a blinding attack */
-            if (target->head)
+                if (target->head)
-              target = target->head;
+                  target = target->head;
-            hit_player (target, dam, op, spell->attacktype, 1);
+                hit_player (target, dam, op, spell->attacktype, 1);
-            return 1;           /* one success only! */
+                return 1;           /* one success only! */
+              }
-          }
+        }
-    }
-  /* no live target, perhaps a wall is in the way? */
+      /* no live target, perhaps a wall is in the way? */
-  if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)))
+      if (OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, x, y)))
-    {
+        {
-      new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
+          new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
-      return 0;
+          return 0;
+        }
     }
   /* ok, looks groovy to just insert a new light on the map */
   tmp = arch_to_object (spell->other_arch);
   if (!tmp)
     {
       LOG (llevError, "Error: spell arch for cast_light() missing.\n");
       return 0;
     }
   tmp->stats.food = spell->duration + SP_level_duration_adjust (caster, spell);
   if (tmp->glow_radius)
-    {
-      tmp->glow_radius = spell->range + SP_level_range_adjust (caster, spell);
+    tmp->glow_radius = min (MAX_LIGHT_RADIUS, spell->range + SP_level_range_adjust (caster, spell));
-      if (tmp->glow_radius > MAX_LIGHT_RADII)
-        tmp->glow_radius = MAX_LIGHT_RADII;
-    }
+  if (dir)
-  m->insert (tmp, x, y, op);
+    m->insert (tmp, x, y, op);
+  else
+    caster->outer_env ()->insert (tmp);
   return 1;
 }
 /* cast_cause_disease:  this spell looks along <dir> from the
  * player and infects someone.
                 object *disease = arch_to_object (spell->other_arch);
                 disease->set_owner (op);
                 set_spell_skill (op, caster, spell, disease);
                 disease->stats.exp = 0;
-                disease->level = caster_level (caster, spell);
+                disease->level = casting_level (caster, spell);
                 /* do level adjustments */
                 if (disease->stats.wc)
                   disease->stats.wc += dur_mod / 2;

Diff Legend

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

Comparing deliantra/server/server/spell_attack.C (file contents): Revision 1.62 by root, Mon Jul 14 00:04:57 2008 UTC vs. Revision 1.73 by root, Sun Dec 28 06:59:27 2008 UTC

Diff Legend

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.62 by root, Mon Jul 14 00:04:57 2008 UTC vs.
Revision 1.73 by root, Sun Dec 28 06:59:27 2008 UTC