--- deliantra/server/server/spell_attack.C	2008/07/14 00:04:57	1.62
+++ deliantra/server/server/spell_attack.C	2008/10/06 08:46:33	1.68
@@ -167,7 +167,7 @@
 
   if (--op->duration < 0)
     {
-      op->destroy ();
+      op->drop_and_destroy ();
       return;
     }
  
@@ -309,7 +309,7 @@
   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;
     }
 
@@ -319,7 +319,7 @@
     {
       if (!QUERY_FLAG (tmp, FLAG_REFLECTING))
         {
-          tmp->destroy ();
+          tmp->drop_and_destroy ();
           return 0;
         }
 
@@ -395,7 +395,7 @@
 {
   object *tmp, *owner;
 
-  if (op->other_arch == NULL)
+  if (!op->other_arch)
     {
       LOG (llevError, "BUG: explode_bullet(): op without other_arch\n");
       op->destroy ();
@@ -447,7 +447,10 @@
 
   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;
@@ -523,6 +526,7 @@
         {
           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))
@@ -735,15 +739,20 @@
 
   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 ())
-    return;
+      if (!op->is_on_map ())
+        return;
+    }
 
   if (op->duration-- < 0)
     {
@@ -862,7 +871,7 @@
       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 */
@@ -1114,7 +1123,7 @@
     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))
     {
@@ -1181,7 +1190,7 @@
 {
   if (op->range-- <= 0)
     {
-      op->destroy ();
+      op->drop_and_destroy ();
       return;
     }
 
@@ -1453,7 +1462,7 @@
    * 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_...
@@ -1741,7 +1750,7 @@
 
   if (!op->duration || !owner->is_on_map ())
     {
-      op->destroy ();
+      op->drop_and_destroy ();
       return;
     }
 
@@ -1847,7 +1856,7 @@
   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;
 
@@ -2000,7 +2009,7 @@
                 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)