--- deliantra/server/server/spell_attack.C	2007/11/08 19:43:28	1.49
+++ deliantra/server/server/spell_attack.C	2008/04/20 23:25:09	1.50
@@ -407,8 +407,9 @@
 
   if (op->env)
     {
-      object *env = object_get_env_recursive (op);
-      if (env->map == NULL || out_of_map (env->map, env->x, env->y))
+      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 ();
@@ -939,13 +940,10 @@
 void
 animate_bomb (object *op)
 {
-  int i;
-  object *env, *tmp;
-
   if (op->state != NUM_ANIMATIONS (op) - 1)
     return;
 
-  env = object_get_env_recursive (op);
+  object *env = op->outer_env ();
 
   if (op->env)
     {
@@ -974,12 +972,12 @@
    */
   if (archetype *at = archetype::find (SPLINT))
     {
-      for (i = 1; i < 9; i++)
+      for (int i = 1; i < 9; i++)
         {
           if (out_of_map (op->map, op->x + freearr_x[i], op->y + freearr_x[i]))
             continue;
 
-          tmp = arch_to_object (at);
+          object *tmp = arch_to_object (at);
           tmp->direction = i;
           tmp->range = op->range;
           tmp->stats.dam = op->stats.dam;