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

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.65 by root, Mon Sep 29 10:20:49 2008 UTC vs.
Revision 1.71 by root, Mon Dec 22 21:51:11 2008 UTC

   sint16 x, y;
   maptile *m;
   if (--op->duration < 0)
     {
-      op->destroy_inv (true); // be explicit about dropping
-      op->destroy (true);
+      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_inv (true); // be explicit about dropping
-      tmp->destroy (true);
+      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_inv (true); // be explicit about dropping
-          tmp->destroy (true);
+          tmp->drop_and_destroy ();
           return 0;
         }
       tmp->x = op->x;
       tmp->y = op->y;
   maptile *m = op->map;
   int i;
   if (--op->duration < 0)
     {
-      op->destroy (true);
+      op->destroy ();
       return;
     }
   hit_map (op, 0, op->attacktype, 0);
   object *tmp, *owner;
   if (!op->other_arch)
     {
       LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
-      op->destroy (true);
+      op->destroy ();
       return;
     }
   if (op->env)
     {
       object *env = op->outer_env ();
       if (!env->map || out_of_map (env->map, env->x, env->y))
         {
           LOG (llevError, "BUG: explode_bullet(): env out of map\n");
-          op->destroy (true);
+          op->destroy ();
           return;
         }
       op->insert_at (env, op, INS_NO_MERGE | INS_NO_WALK_ON);
     }
   else if (out_of_map (op->map, op->x, op->y))
     {
       LOG (llevError, "BUG: explode_bullet(): op out of map\n");
-      op->destroy (true);
+      op->destroy ();
       return;
     }
   // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps
   // NOTE: If this breaks something important: remove this. I can't think of anything
   // bad at the moment that might happen from this.
   if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
     {
-      op->destroy (true);
+      op->destroy ();
       return;
     }
   if (op->attacktype)
     {
   if ((tmp->attacktype & AT_HOLYWORD
        || tmp->attacktype & AT_GODPOWER)
       && owner
       && !tailor_god_spell (tmp, owner))
     {
-      op->destroy (true);
+      op->destroy ();
       return;
     }
   /* special for bombs - it actually has sane values for these */
   if (op->type == SPELL_EFFECT && op->subtype == SP_BOMB)
   tmp->insert_at (op, op);
   tmp->play_sound (tmp->sound);
   /* remove the firebullet */
-  op->destroy (true);
+  op->destroy ();
 }
 /* checks to see what op should do, given the space it is on
  * (eg, explode, damage player, etc)
  */
           // 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 (true);
+                  op->destroy ();
                   return;
                 }
             }
         }
     }
   if (--op->range <= 0)
     {
       if (op->other_arch)
         explode_bullet (op);
       else
-        op->destroy (true);
+        op->destroy ();
       return;
     }
   new_x = op->x + DIRX (op);
   m = op->map;
   mflags = get_map_flags (m, &m, new_x, new_y, &new_x, &new_y);
   if (mflags & P_OUT_OF_MAP)
     {
-      op->destroy (true);
+      op->destroy ();
       return;
     }
   if (!op->direction || OB_TYPE_MOVE_BLOCK (op, GET_MAP_MOVE_BLOCK (m, new_x, new_y)))
     {
       if (op->other_arch)
         explode_bullet (op);
       else
-        op->destroy (true);
+        op->destroy ();
       return;
     }
   if (!(op = m->insert (op, new_x, new_y, op)))
   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 (true);
+      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->destroy (true);
+          tmp->destroy ();
           return 0;
         }
       tmp->x = op->x;
       tmp->y = op->y;
    * when their cone dies when they die.
    */
   /* If no owner left, the spell dies out. */
   if (op->owner == NULL)
     {
-      op->destroy (true);
+      op->destroy ();
       return;
     }
 #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 (true);
+      op->destroy ();
       return;
     }
   /* Object has hit maximum range, so don't have it move
    * any further.  When the duration above expires,
    * then the object will get removed.
   // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding
   // on a safe map. I don't like this special casing, but it seems to be neccessary
   // as bombs can be carried.
   if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE)
     {
-      op->destroy (true);
+      op->destroy ();
       return;
     }
   /* This copies a lot of the code from the fire bullet,
    * but using the cast_bullet isn't really feasible,
   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  */
             }
           else
             {
               new_draw_info_format (NDI_UNIQUE, 0, op, "The %s looks stronger!", query_name (target));
               target->stats.hp = target->stats.maxhp * 2;
-              effect->destroy (true);
+              effect->destroy ();
               return 0;
             }
         }
     }
   else
 void
 move_missile (object *op)
 {
   if (op->range-- <= 0)
     {
-      op->destroy_inv (true); // be explicit about dropping
-      op->destroy (true);
+      op->drop_and_destroy ();
       return;
     }
   mapxy pos (op);
   pos.move (op->direction);
   if (!pos.normalise ())
     {
-      op->destroy (true);
+      op->destroy ();
       return;
     }
   mapspace &ms = pos.ms ();
     {
       hit_map (op, op->direction, AT_MAGIC, 1);
       /* Basically, missile only hits one thing then goes away.
        * we need to remove it if someone hasn't already done so.
        */
-      op->destroy (true);
+      op->destroy ();
       return;
     }
   if (!op->direction)
     {
-      op->destroy (true);
+      op->destroy ();
       return;
     }
   int i = spell_find_dir (pos.m, pos.x, pos.y, op->owner);
   if (i > 0 && i != 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;
       }                         /* 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;
   object *owner = op->env;
   if (!owner) // MUST not happen, remove when true TODO
     {
       LOG (llevError, "swarm spell found outside inventory: %s\n", op->debug_desc ());
-      op->destroy (true);
+      op->destroy ();
       return;
     }
   if (!op->duration || !owner->is_on_map ())
     {
-      op->destroy_inv (true); // be explicit about dropping
-      op->destroy (true);
+      op->drop_and_destroy ();
       return;
     }
   op->duration--;
   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.
                 if (infect_object (walk, disease, 1))
                   {
                     new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
-                    disease->destroy (true);      /* don't need this one anymore */
+                    disease->destroy ();      /* don't need this one anymore */
                     walk->map->insert (get_archetype ("detect_magic"), x, y, op);
                     return 1;
                   }
-                disease->destroy (true);
+                disease->destroy ();
               }
         }                       /* if living creature */
     }                           /* for range of spaces */
   new_draw_info (NDI_UNIQUE, 0, op, "No one caught anything!");

Diff Legend

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

Comparing deliantra/server/server/spell_attack.C (file contents): Revision 1.65 by root, Mon Sep 29 10:20:49 2008 UTC vs. Revision 1.71 by root, Mon Dec 22 21:51:11 2008 UTC

Diff Legend

Comparing deliantra/server/server/spell_attack.C (file contents):
Revision 1.65 by root, Mon Sep 29 10:20:49 2008 UTC vs.
Revision 1.71 by root, Mon Dec 22 21:51:11 2008 UTC