--- deliantra/server/server/spell_attack.C	2009/03/02 11:45:19	1.83
+++ deliantra/server/server/spell_attack.C	2009/09/01 20:56:05	1.84
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
@@ -949,7 +949,7 @@
 
   if (op->env)
     {
-      if (env->map == NULL)
+      if (!env->map)
         return;
 
       if (!(op = op->insert_at (env, op)))
@@ -959,7 +959,7 @@
   // 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)
+  if (op->ms ().flags () & P_SAFE)
     {
       op->destroy ();
       return;
@@ -1910,7 +1910,8 @@
 
   if (tmp->glow_radius)
     tmp->set_glow_radius (
-      min (MAX_LIGHT_RADIUS, spell->range + SP_level_range_adjust (caster, spell)));
+      min (MAX_LIGHT_RADIUS, spell->range + SP_level_range_adjust (caster, spell))
+    );
 
   if (dir)
     m->insert (tmp, x, y, op);